Adjust modules to new path DDModules

Merge branch 'Bereinigung_LoadProfil'

app/DD_PM_WINDREAM/App.config

@@ -5,7 +5,7 @@
       <section name="DD_ProcessManager.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
       <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection" requirePermission="false" />
     </sectionGroup>
-    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" >
+    <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="DD_ProcessManager.My.MySettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
     </sectionGroup>
   </configSections>
@@ -20,10 +20,10 @@
     </DD_ProcessManager.My.MySettings>
     <DevExpress.LookAndFeel.Design.AppSettings>
       <setting name="DefaultAppSkin" serializeAs="String">
-        <value>Skin/Office 2016 Colorful</value>
+        <value>Skin/Office 2019 White</value>
       </setting>
       <setting name="DefaultPalette" serializeAs="String">
-        <value></value>
+        <value>Custom/Digital Data</value>
       </setting>
       <setting name="TouchUI" serializeAs="String">
         <value></value>
@@ -53,14 +53,41 @@
         <value></value>
       </setting>
       <setting name="CustomPaletteCollection" serializeAs="Xml">
-        <value />
+        <value>
+          <CustomPaletteCollection>
+            <Skin Name="Office 2019 White">
+              <SvgPalette Name="Digital Data">
+                <SvgColor Name="Paint" Value="White" />
+                <SvgColor Name="Paint High" Value="White" />
+                <SvgColor Name="Paint Shadow" Value="240,240,240" />
+                <SvgColor Name="Paint Deep Shadow" Value="230,230,230" />
+                <SvgColor Name="Brush" Value="72,70,68" />
+                <SvgColor Name="Brush High" Value="72,70,68" />
+                <SvgColor Name="Brush Light" Value="119,119,119" />
+                <SvgColor Name="Brush Major" Value="171,171,171" />
+                <SvgColor Name="Brush Minor" Value="225,225,225" />
+                <SvgColor Name="Accent Paint" Value="165,36,49" />
+                <SvgColor Name="Accent Paint Dark" Value="133,28,38" />
+                <SvgColor Name="Accent Paint Light" Value="250,220,221" />
+                <SvgColor Name="Accent Paint Lighter" Value="251,233,234" />
+                <SvgColor Name="Accent Brush" Value="255,255,255" />
+                <SvgColor Name="Accent Brush Light" Value="218,175,176" />
+                <SvgColor Name="Red" Value="237,61,59" />
+                <SvgColor Name="Green" Value="48,144,72" />
+                <SvgColor Name="Blue" Value="30,139,205" />
+                <SvgColor Name="Yellow" Value="251,152,59" />
+                <SvgColor Name="Black" Value="87,87,85" />
+                <SvgColor Name="Gray" Value="169,168,168" />
+                <SvgColor Name="White" Value="255,255,255" />
+              </SvgPalette>
+            </Skin>
+          </CustomPaletteCollection>
+        </value>
       </setting>
     </DevExpress.LookAndFeel.Design.AppSettings>
   </applicationSettings>
   <connectionStrings>
-    <add name="DD_ProcessManager.My.MySettings.ConnectionString"
-      connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd"
-      providerName="System.Data.SqlClient" />
+    <add name="DD_ProcessManager.My.MySettings.ConnectionString" connectionString="Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd" providerName="System.Data.SqlClient" />
   </connectionStrings>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />

app/DD_PM_WINDREAM/ClassAllgemeineFunktionen.vb

@@ -205,7 +205,7 @@ Public Class ClassAllgemeineFunktionen
                 Do While Check_File_exists(_Ziel, clsWD) = True
                     Dim neuername As String = Stammname & "~" & version & extension
                     _Ziel = neuername
-                    version = version + 1
+                    version += 1
                 Loop
                 My.Computer.FileSystem.MoveFile(vMove_File, _Ziel)
                 LOGGER.Info("Datei erfolgreich verschoben - Ziel: " & _Ziel)

app/DD_PM_WINDREAM/ClassConstants.vb

@@ -2,4 +2,11 @@
     Public Const OpModeFS_PWM = "PURE_WM"
     Public Const OpModeFS_IDBWM = "IDB_WM"
     Public Const OpModeFS_ZF = "ZOOFLOW"
+
+    Public Const CAT_INFORMATION = "Information"
+    Public Const CAT_GENERAL = "Allgemein"
+    Public Const CAT_DISPLAY = "Anzeige"
+    Public Const CAT_BEHAVIOUR = "Verhalten"
+    Public Const CAT_DATA = "Daten"
+    Public Const CAT_VALIDATION = "Validierung"
 End Class

app/DD_PM_WINDREAM/ClassControlCreator.vb

@@ -74,6 +74,7 @@ Public Class ClassControlCreator
 
     Public Class ControlMetadata
         Public Guid As Integer
+        Public Name As String
         Public [ReadOnly] As Boolean = False
     End Class
 
@@ -108,7 +109,8 @@ Public Class ClassControlCreator
 
             ctrl.Tag = New ControlMetadata() With {
                 .Guid = props.Guid,
-                .ReadOnly = props.ReadOnly
+                .ReadOnly = props.ReadOnly,
+                .Name = props.Name
             }
             ctrl.Name = props.Name
             ctrl.Location = props.Location
@@ -287,6 +289,7 @@ Public Class ClassControlCreator
                 control.ReadOnly = oControlRow.Item("READ_ONLY")
                 control.TabStop = Not oControlRow.Item("READ_ONLY")
                 control.BackColor = IIf(oControlRow.Item("READ_ONLY"), Color.LightGray, Color.White)
+                control.ScrollBars = ScrollBars.Vertical
             Else
                 control.ReadOnly = True
             End If
@@ -578,8 +581,9 @@ Public Class ClassControlCreator
             Catch ex As Exception
 
             End Try
-
         End If
+
+
         Dim oShouldDisplayFooter As Boolean = False
 
         For Each oCol As GridColumn In oView.Columns
@@ -698,7 +702,15 @@ Public Class ClassControlCreator
         AddHandler oView.ValidateRow, AddressOf View_ValidateRow
         AddHandler oControl.LostFocus, Sub(sender As GridControl, e As EventArgs)
                                            Dim oView2 As GridView = sender.FocusedView
-                                           oView2.UpdateCurrentRow()
+
+                                           ' 19.08.2022: 
+                                           ' Calling UpdateCurrentRow when newRowModified Is true
+                                           ' leads to some weird jumping of focus in the current cell.
+                                           ' This seems to fix it.
+                                           If newRowModified = False Then
+                                               oView2.UpdateCurrentRow()
+                                           End If
+
                                        End Sub
 
         ' 08.11.2021: Fix editor being empty on first open
@@ -1036,7 +1048,7 @@ Public Class ClassControlCreator
             Logger.Error(ex)
         End Try
 
-        If oIsRequired And pValue.ToString = "" Then
+        If oIsRequired And (pValue IsNot Nothing AndAlso pValue.ToString = "") Then
             pErrorText = "Spalte muss ausgefüllt werden!"
             pIsValid = False
             Return False

app/DD_PM_WINDREAM/ClassFinalIndex.vb

@@ -168,7 +168,7 @@ Public Class ClassFinalIndex
         Return LIST_VECTOR_INDICIES.Contains(type)
     End Function
 
-    Public Shared Function GetIndexType(indexName As String, indicies As List(Of String), types As List(Of Integer))
+    Public Function GetIndexType(indexName As String, indicies As List(Of String), types As List(Of Integer)) As Integer
         Try
             Dim position As Integer = indicies.IndexOf(indexName)
             Dim type As Integer = types.Item(position)
@@ -176,6 +176,7 @@ Public Class ClassFinalIndex
             Return type
         Catch ex As Exception
             MsgBox(ex.Message & vbNewLine & $"Please check whether attribute {indexName} exists in AtributesList!", MsgBoxStyle.Critical)
+            Return Nothing
         End Try
 
     End Function

app/DD_PM_WINDREAM/ClassIDBData.vb

@@ -207,7 +207,7 @@
                             Next
                             If oExists = False Then
                                 Dim oInfo2 = $"Value [{oOldAttributeResult}] no longer existing in Vector-Attribute [{oAttributeName}] - will be deleted!"
-                                LOGGER.Info(oInfo2)
+                                LOGGER.Debug(oInfo2)
                                 'SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo2)
                                 Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult)
                             End If
@@ -215,7 +215,7 @@
                             '### there is only ONE new value ###
                             If oDTMyNewValues.Rows(0).Item(1) <> oOldAttributeResult Then
                                 Dim oInfo = $"Value [{oOldAttributeResult}] of Attribute [{oAttributeName}] obviously was updated during runtime - will be deleted!"
-                                LOGGER.Info(oInfo)
+                                LOGGER.Debug(oInfo)
                                 SetVariableValue(CURRENT_PROFILE_LOG_INDEX, oInfo)
                                 Delete_Term_Object_From_Metadata(oAttributeName, oOldAttributeResult)
                             Else

app/DD_PM_WINDREAM/ClassInit.vb

@@ -117,21 +117,14 @@ Public Class ClassInit
             INDEX_DMS_ERSTELLT = CONFIG.Config.IndexDmsErstellt
             INDEX_DMS_ERSTELLT_ZEIT = CONFIG.Config.IndexDmsErstelltZeit
 
-            USER_MANAGER_PATH = CONFIG.Config.UserManagerPath
-
             USER_CONFIG_DEBUG = CONFIG.Config.DEBUG
             If USER_CONFIG_DEBUG = True Then
                 DEBUG = True
                 LOGCONFIG.Debug = True
             End If
-
-            TEST_MODE = CONFIG.Config.TestMode
         Catch ex As Exception
             LOGGER.Error(ex)
         End Try
-
-
-        'Settings_Load()
     End Sub
 
     Private Function DecryptConnectionString(EncryptedConnectionString As String) As String
@@ -353,30 +346,6 @@ Public Class ClassInit
                 End Try
                 USER_DATE_FORMAT = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")
 
-                'If Not IsNothing(BASEDATA_DT_TBDD_SQL_COMMANDS) Then
-                '    If BASEDATA_DT_TBDD_SQL_COMMANDS.Rows.Count > 0 Then
-                '        For Each oRow As DataRow In BASEDATA_DT_TBDD_SQL_COMMANDS.Rows
-                '            If oRow.Item("TITLE") = "LICENSE_COUNT_PM" Then
-                '                oSQL = oRow.Item("SQL_COMMAND")
-                '                Dim oResult = _Client.GetScalarValueFromECM(oSQL)
-                '                If oResult.OK Then
-                '                    USERCOUNT_LOGGED_IN = oResult.Scalar
-                '                Else
-                '                    USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
-                '                End If
-                '            End If
-                '        Next
-                '    Else
-                '        LOGGER.Warn("BASEDATA_DT_TBDD_SQL_COMMANDS.Rows = 0!")
-                '        USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
-                '    End If
-                'Else
-                '    LOGGER.Warn("BASEDATA_DT_TBDD_SQL_COMMANDS is nothing!")
-                '    USERCOUNT_LOGGED_IN = DT_CHECKUSER_MODULE.Rows(0).Item("USERCOUNT_LOGGED_IN")
-                'End If
-
-
-
 
                 ClassParamRefresh.Refresh_Params(DT_CHECKUSER_MODULE)
 

app/DD_PM_WINDREAM/ClassParamRefresh.vb

@@ -34,13 +34,14 @@ Public Class ClassParamRefresh
             End Try
             Try
                 ADDITIONAL_TITLE = DT_CHECKUSER.Rows(0).Item("ADDITIONAL_TITLE")
+
                 If ADDITIONAL_TITLE = String.Empty Then
                     ADDITIONAL_TITLE = My.Application.Info.ProductName
                 End If
             Catch ex As Exception
                 ADDITIONAL_TITLE = My.Application.Info.ProductName
             End Try
-
+            TITLE_NOTIFICATIONS = ADDITIONAL_TITLE
             Dim oSplitWorkMode As String() = WORKING_MODE.Split("#")
 
             ' Use For Each loop over words and display them.
@@ -121,7 +122,6 @@ Public Class ClassParamRefresh
                 ElseIf oMode.StartsWith("PM.INACTIVITY_DURATION") Then
                     Dim oInactivityDuration = oMode.Replace("PM.INACTIVITY_DURATION=", "")
                     Try
-
                         INACTIVITY_DURATION = CInt(oInactivityDuration)
                         LOGGER.Debug($"InactivityDuration [{INACTIVITY_DURATION}]")
                     Catch ex As Exception
@@ -177,6 +177,13 @@ Public Class ClassParamRefresh
                     Catch ex As Exception
                         TL_ICON = False
                     End Try
+                ElseIf oMode.StartsWith("PM.TITLE_NOTIFICATIONS") Then
+                    Dim oParam = oMode.Replace("PM.TITLE_NOTIFICATIONS=", "")
+                    Try
+                        TITLE_NOTIFICATIONS = oParam
+                    Catch ex As Exception
+                        TITLE_NOTIFICATIONS = ""
+                    End Try
                 ElseIf oMode.StartsWith("PM.START_CW") Then
                     Dim oAfterReplace = oMode.Replace("PM.START_CW=", "")
                     Try

app/DD_PM_WINDREAM/ClassRefreshHelper.vb

@@ -64,6 +64,11 @@ Public Class RefreshHelper
     Private Function FindParentRowHandle(pRowInfo As RowInfo, oRowHandle As Integer) As Integer
         Dim oParentRowHandle As Integer = _View.GetParentRowHandle(oRowHandle)
 
+        ' Fixes endless loop when parent row handle is below zero
+        If oParentRowHandle < 0 Then
+            Return oParentRowHandle
+        End If
+
         Do While _View.GetRowLevel(oParentRowHandle) <> pRowInfo.Level
             oParentRowHandle = _View.GetParentRowHandle(oParentRowHandle)
         Loop

app/DD_PM_WINDREAM/ClassSQLEditor.vb

@@ -12,16 +12,27 @@ Public Class ClassSQLEditor
     End Function
 
     Public Overrides Function EditValue(context As ITypeDescriptorContext, provider As IServiceProvider, value As Object) As Object
-        Dim svc As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
-        Dim SQLSTring As String = DirectCast(value, SQLValue).Value
+        Dim oService As IWindowsFormsEditorService = TryCast(provider.GetService(GetType(IWindowsFormsEditorService)), IWindowsFormsEditorService)
 
-        If svc IsNot Nothing AndAlso SQLSTring IsNot Nothing Then
+        Dim oValueObject = DirectCast(value, SQLValue)
+        Dim oSQLString As String = oValueObject.Value
+        Dim oSQLConnection As Integer = oValueObject.ConnectionId
+
+        If oService IsNot Nothing AndAlso oSQLString IsNot Nothing Then
             'CURRENT_DESIGN_TYPE = "INPUT_INDEX"
             Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM)
-                oForm.SQLCommand = SQLSTring
-                If svc.ShowDialog(oForm) = DialogResult.OK Then
-                    Dim sql As New SQLValue(oForm.SQLCommand)
-                    CURRENT_SQL_CON = oForm.SQLConnection
+                oForm.SQLCommand = oSQLString
+                oForm.SQLConnection = oSQLConnection
+
+                oForm.PlaceholdersManualPrefix = "CTRL"
+                oForm.PlaceholdersManualTitle = "Controls"
+                oForm.PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.
+                    ToDictionary(Function(name) name, Function(name) name)
+
+                If oService.ShowDialog(oForm) = DialogResult.OK Then
+                    Dim sql As New SQLValue(oForm.SQLCommand, oForm.SQLConnection)
+                    ' CURRENT_CONN_ID_FINAL_INDEX = oForm.SQLConnection
+                    ' CURRENT_CONN_ID = oForm.SQLConnection
                     value = sql
                 End If
             End Using

app/DD_PM_WINDREAM/ClassSQLValue.vb

@@ -7,12 +7,18 @@ Imports System.Drawing.Design
 <TypeConverter(GetType(SQLTypeConverter))>
 Public Class SQLValue
     Public Property Value As String
+    Public Property ConnectionId As Integer
 
     Public Sub New()
-        Me.Value = ""
+        Value = ""
     End Sub
 
     Public Sub New(value As String)
         Me.Value = value
     End Sub
+
+    Public Sub New(pValue As String, pConnectionId As Integer)
+        Value = pValue
+        ConnectionId = pConnectionId
+    End Sub
 End Class

app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb

@@ -4581,6 +4581,8 @@ Partial Public Class DD_DMSLiteDataSet
         
         Private columnTABLE_ORDER_COLUMN As Global.System.Data.DataColumn
         
+        Private columnSAVE_CHANGE_ON_ENABLED As Global.System.Data.DataColumn
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Sub New()
@@ -4936,6 +4938,14 @@ Partial Public Class DD_DMSLiteDataSet
             End Get
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public ReadOnly Property SAVE_CHANGE_ON_ENABLEDColumn() As Global.System.Data.DataColumn
+            Get
+                Return Me.columnSAVE_CHANGE_ON_ENABLED
+            End Get
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0"),  _
          Global.System.ComponentModel.Browsable(false)>  _
@@ -5012,9 +5022,10 @@ Partial Public Class DD_DMSLiteDataSet
                     ByVal SQL_ENABLE_ON_LOAD As String,  _
                     ByVal SQL_ENABLE_ON_LOAD_CONID As Byte,  _
                     ByVal CONTROL_ACTIVE As Boolean,  _
-                    ByVal TABLE_ORDER_COLUMN As String) As TBPM_PROFILE_CONTROLSRow
+                    ByVal TABLE_ORDER_COLUMN As String,  _
+                    ByVal SAVE_CHANGE_ON_ENABLED As Boolean) As TBPM_PROFILE_CONTROLSRow
             Dim rowTBPM_PROFILE_CONTROLSRow As TBPM_PROFILE_CONTROLSRow = CType(Me.NewRow,TBPM_PROFILE_CONTROLSRow)
-            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN}
+            Dim columnValuesArray() As Object = New Object() {Nothing, Nothing, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED}
             If (Not (parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE) Is Nothing) Then
                 columnValuesArray(1) = parentTBPM_PROFILERowByFK_TBPM_PROFILE_CONTROLS_PROFILE(0)
             End If
@@ -5086,6 +5097,7 @@ Partial Public Class DD_DMSLiteDataSet
             Me.columnSQL_ENABLE_ON_LOAD_CONID = MyBase.Columns("SQL_ENABLE_ON_LOAD_CONID")
             Me.columnCONTROL_ACTIVE = MyBase.Columns("CONTROL_ACTIVE")
             Me.columnTABLE_ORDER_COLUMN = MyBase.Columns("TABLE_ORDER_COLUMN")
+            Me.columnSAVE_CHANGE_ON_ENABLED = MyBase.Columns("SAVE_CHANGE_ON_ENABLED")
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -5171,6 +5183,8 @@ Partial Public Class DD_DMSLiteDataSet
             MyBase.Columns.Add(Me.columnCONTROL_ACTIVE)
             Me.columnTABLE_ORDER_COLUMN = New Global.System.Data.DataColumn("TABLE_ORDER_COLUMN", GetType(String), Nothing, Global.System.Data.MappingType.Element)
             MyBase.Columns.Add(Me.columnTABLE_ORDER_COLUMN)
+            Me.columnSAVE_CHANGE_ON_ENABLED = New Global.System.Data.DataColumn("SAVE_CHANGE_ON_ENABLED", GetType(Boolean), Nothing, Global.System.Data.MappingType.Element)
+            MyBase.Columns.Add(Me.columnSAVE_CHANGE_ON_ENABLED)
             Me.Constraints.Add(New Global.System.Data.UniqueConstraint("Constraint1", New Global.System.Data.DataColumn() {Me.columnGUID}, true))
             Me.columnGUID.AutoIncrement = true
             Me.columnGUID.AllowDBNull = false
@@ -5181,6 +5195,7 @@ Partial Public Class DD_DMSLiteDataSet
             Me.columnNAME.MaxLength = 100
             Me.columnCTRL_TYPE.AllowDBNull = false
             Me.columnCTRL_TYPE.MaxLength = 10
+            Me.columnCTRL_TEXT.AllowDBNull = false
             Me.columnCTRL_TEXT.MaxLength = 100
             Me.columnX_LOC.AllowDBNull = false
             Me.columnY_LOC.AllowDBNull = false
@@ -5215,6 +5230,7 @@ Partial Public Class DD_DMSLiteDataSet
             Me.columnTABLE_ORDER_COLUMN.AllowDBNull = false
             Me.columnTABLE_ORDER_COLUMN.DefaultValue = CType("",String)
             Me.columnTABLE_ORDER_COLUMN.MaxLength = 250
+            Me.columnSAVE_CHANGE_ON_ENABLED.AllowDBNull = false
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -5828,6 +5844,7 @@ Partial Public Class DD_DMSLiteDataSet
             Me.columnREGEX_MESSAGE_DE.AllowDBNull = false
             Me.columnREGEX_MESSAGE_DE.MaxLength = 1000
             Me.columnSEQUENCE.AllowDBNull = false
+            Me.columnDEFAULT_VALUE.AllowDBNull = false
             Me.columnDEFAULT_VALUE.MaxLength = 2147483647
             Me.columnADVANCED_LOOKUP.AllowDBNull = false
             Me.columnSUMMARY_FUNCTION.AllowDBNull = false
@@ -11972,11 +11989,7 @@ Partial Public Class DD_DMSLiteDataSet
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Property CTRL_TEXT() As String
             Get
-                Try 
-                    Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.CTRL_TEXTColumn),String)
-                Catch e As Global.System.InvalidCastException
-                    Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte CTRL_TEXT in Tabelle TBPM_PROFILE_CONTROLS ist DBNull.", e)
-                End Try
+                Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.CTRL_TEXTColumn),String)
             End Get
             Set
                 Me(Me.tableTBPM_PROFILE_CONTROLS.CTRL_TEXTColumn) = value
@@ -12448,6 +12461,17 @@ Partial Public Class DD_DMSLiteDataSet
             End Set
         End Property
         
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
+        Public Property SAVE_CHANGE_ON_ENABLED() As Boolean
+            Get
+                Return CType(Me(Me.tableTBPM_PROFILE_CONTROLS.SAVE_CHANGE_ON_ENABLEDColumn),Boolean)
+            End Get
+            Set
+                Me(Me.tableTBPM_PROFILE_CONTROLS.SAVE_CHANGE_ON_ENABLEDColumn) = value
+            End Set
+        End Property
+        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Property TBPM_PROFILERow() As TBPM_PROFILERow
@@ -12459,18 +12483,6 @@ Partial Public Class DD_DMSLiteDataSet
             End Set
         End Property
         
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Function IsCTRL_TEXTNull() As Boolean
-            Return Me.IsNull(Me.tableTBPM_PROFILE_CONTROLS.CTRL_TEXTColumn)
-        End Function
-        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Sub SetCTRL_TEXTNull()
-            Me(Me.tableTBPM_PROFILE_CONTROLS.CTRL_TEXTColumn) = Global.System.Convert.DBNull
-        End Sub
-        
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Function IsCHANGED_WHONull() As Boolean
@@ -12958,11 +12970,7 @@ Partial Public Class DD_DMSLiteDataSet
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
         Public Property DEFAULT_VALUE() As String
             Get
-                Try 
-                    Return CType(Me(Me.tableTBPM_CONTROL_TABLE.DEFAULT_VALUEColumn),String)
-                Catch e As Global.System.InvalidCastException
-                    Throw New Global.System.Data.StrongTypingException("Der Wert für Spalte DEFAULT_VALUE in Tabelle TBPM_CONTROL_TABLE ist DBNull.", e)
-                End Try
+                Return CType(Me(Me.tableTBPM_CONTROL_TABLE.DEFAULT_VALUEColumn),String)
             End Get
             Set
                 Me(Me.tableTBPM_CONTROL_TABLE.DEFAULT_VALUEColumn) = value
@@ -13094,18 +13102,6 @@ Partial Public Class DD_DMSLiteDataSet
         Public Sub SetCHANGED_WHENNull()
             Me(Me.tableTBPM_CONTROL_TABLE.CHANGED_WHENColumn) = Global.System.Convert.DBNull
         End Sub
-        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Function IsDEFAULT_VALUENull() As Boolean
-            Return Me.IsNull(Me.tableTBPM_CONTROL_TABLE.DEFAULT_VALUEColumn)
-        End Function
-        
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "16.0.0.0")>  _
-        Public Sub SetDEFAULT_VALUENull()
-            Me(Me.tableTBPM_CONTROL_TABLE.DEFAULT_VALUEColumn) = Global.System.Convert.DBNull
-        End Sub
     End Class
     
     '''<summary>
@@ -20188,6 +20184,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             tableMapping.ColumnMappings.Add("SQL_ENABLE_ON_LOAD_CONID", "SQL_ENABLE_ON_LOAD_CONID")
             tableMapping.ColumnMappings.Add("CONTROL_ACTIVE", "CONTROL_ACTIVE")
             tableMapping.ColumnMappings.Add("TABLE_ORDER_COLUMN", "TABLE_ORDER_COLUMN")
+            tableMapping.ColumnMappings.Add("SAVE_CHANGE_ON_ENABLED", "SAVE_CHANGE_ON_ENABLED")
             Me._adapter.TableMappings.Add(tableMapping)
             Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.DeleteCommand.Connection = Me.Connection
@@ -20201,24 +20198,23 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "N, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FON"& _ 
                 "T_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VK"& _ 
                 "T_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         REGEX_MESSAGE"& _ 
-                "_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PROFIL_"& _ 
-                "ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO"& _ 
-                ",@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEB"& _ 
-                "ERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_"& _ 
-                "ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULT"& _ 
-                "IPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL"& _ 
-                "2,@SQL_ENABLE);  "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_"& _ 
-                "LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATI"& _ 
-                "ON, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FO"& _ 
-                "NT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULT"& _ 
-                "ISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_D"& _ 
-                "E, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) O"& _ 
-                "RDER BY Y_LOC, X_LOC"
+                "_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,"& _ 
+                "@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST"& _ 
+                ",@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_F"& _ 
+                "AMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_AD"& _ 
+                "D_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAG"& _ 
+                "E_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED);   "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID,"& _ 
+                " PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHA"& _ 
+                "NGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID,"& _ 
+                " SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLO"& _ 
+                "R, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREV"& _ 
+                "ENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_P"& _ 
+                "ROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC"
             Me._adapter.InsertCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@X_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Y_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20230,7 +20226,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALIDATION", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VALIDATION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHOICE_LIST", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHOICE_LIST", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_UEBERPRUEFUNG", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_UEBERPRUEFUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_UEBERPRUEFUNG", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_UEBERPRUEFUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HEIGHT", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WIDTH", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_STYLE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_STYLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20243,12 +20239,13 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MULTISELECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "MULTISELECT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VKT_ADD_ITEM", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VKT_ADD_ITEM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MATCH", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MATCH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MATCH", Global.System.Data.SqlDbType.NVarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MATCH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_DE", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_DE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_EN", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_EN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IMAGE_CONTROL", Global.System.Data.SqlDbType.VarBinary, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "IMAGE_CONTROL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL2", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL2", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.InsertCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.UpdateCommand.Connection = Me.Connection
             Me._adapter.UpdateCommand.CommandText = "UPDATE       TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SET                PROFIL_ID = @PROFIL_ID, NA"& _ 
@@ -20263,18 +20260,19 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES = @VKT_PREVENT_MULTIPLE_VALUES, REGEX_MAT"& _ 
                 "CH = @REGEX_MATCH, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         REGEX_MESSAGE_DE = @REGEX_MESSAGE_"& _ 
                 "DE, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, IMAGE_CONTROL = @IMAGE_CONTROL, SQL2 ="& _ 
-                " @SQL2, SQL_ENABLE = @SQL_ENABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID);  "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELEC"& _ 
-                "T GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WH"& _ 
-                "EN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECT"& _ 
-                "ION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FO"& _ 
-                "NT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, V"& _ 
-                "KT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM"& _ 
-                " TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC"
+                " @SQL2, SQL_ENABLE = @SQL_ENABLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SAVE_CHANGE_ON_ENAB"& _ 
+                "LED = @SAVE_CHANGE_ON_ENABLED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID);   "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT "& _ 
+                "GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN"& _ 
+                ", CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTIO"& _ 
+                "N_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT"& _ 
+                "_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT"& _ 
+                "_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM T"& _ 
+                "BPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@PROFIL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@NAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "NAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TYPE", Global.System.Data.SqlDbType.VarChar, 10, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TYPE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CTRL_TEXT", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "CTRL_TEXT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@X_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "X_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Y_LOC", Global.System.Data.SqlDbType.Float, 8, Global.System.Data.ParameterDirection.Input, 0, 0, "Y_LOC", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHANGED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "CHANGED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20283,7 +20281,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALIDATION", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VALIDATION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHOICE_LIST", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHOICE_LIST", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_UEBERPRUEFUNG", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_UEBERPRUEFUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_UEBERPRUEFUNG", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_UEBERPRUEFUNG", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@HEIGHT", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "HEIGHT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@WIDTH", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "WIDTH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@FONT_STYLE", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "FONT_STYLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20296,12 +20294,13 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@MULTISELECT", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "MULTISELECT", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VKT_ADD_ITEM", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VKT_ADD_ITEM", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VKT_PREVENT_MULTIPLE_VALUES", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MATCH", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MATCH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MATCH", Global.System.Data.SqlDbType.NVarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MATCH", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_DE", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_DE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@REGEX_MESSAGE_EN", Global.System.Data.SqlDbType.VarChar, 1000, Global.System.Data.ParameterDirection.Input, 0, 0, "REGEX_MESSAGE_EN", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@IMAGE_CONTROL", Global.System.Data.SqlDbType.VarBinary, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "IMAGE_CONTROL", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL2", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL2", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL2", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_ENABLE", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_ENABLE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
         End Sub
@@ -20326,8 +20325,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "LT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"            "& _ 
                 "             REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL"& _ 
                 "2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, C"& _ 
-                "ONTROL_ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TABLE_ORDER_COLUMN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TB"& _ 
-                "PM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @guid)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
+                "ONTROL_ACTIVE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENA"& _ 
+                "BLED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFILE_CONTROLS"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @guid)"&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("@guid", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(1) = New Global.System.Data.SqlClient.SqlCommand()
@@ -20406,9 +20406,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "                       REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SQL_UEBERPRUEFUNG, TY"& _ 
                 "P, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, I"& _ 
                 "MAGE_CONTROL, SQL2, SQL_ENABLE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SET_CONTROL_DATA, SQL"& _ 
-                "_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"F"& _ 
-                "ROM            TBPM_PROFILE_CONTROLS AS T"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (PROFIL_ID = @profil_id)"& _ 
-                ""&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
+                "_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, S"& _ 
+                "AVE_CHANGE_ON_ENABLED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_PROFILE_CONTROLS AS T"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        "& _ 
+                "(PROFIL_ID = @profil_id)"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"ORDER BY Y_LOC, X_LOC"
             Me._commandCollection(10).CommandType = Global.System.Data.CommandType.Text
             Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@USER_LANGUAGE", Global.System.Data.SqlDbType.VarChar, 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._commandCollection(10).Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@profil_id", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "PROFIL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -20563,7 +20563,8 @@ Namespace DD_DMSLiteDataSetTableAdapters
                     ByVal REGEX_MESSAGE_EN As String,  _
                     ByVal IMAGE_CONTROL() As Byte,  _
                     ByVal SQL2 As String,  _
-                    ByVal SQL_ENABLE As String) As Integer
+                    ByVal SQL_ENABLE As String,  _
+                    ByVal SAVE_CHANGE_ON_ENABLED As Boolean) As Integer
             Me.Adapter.InsertCommand.Parameters(0).Value = CType(PROFIL_ID,Integer)
             If (NAME Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("NAME")
@@ -20686,6 +20687,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Else
                 Me.Adapter.InsertCommand.Parameters(33).Value = CType(SQL_ENABLE,String)
             End If
+            Me.Adapter.InsertCommand.Parameters(34).Value = CType(SAVE_CHANGE_ON_ENABLED,Boolean)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.InsertCommand.Connection.State
             If ((Me.Adapter.InsertCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -20737,6 +20739,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
                     ByVal IMAGE_CONTROL() As Byte,  _
                     ByVal SQL2 As String,  _
                     ByVal SQL_ENABLE As String,  _
+                    ByVal SAVE_CHANGE_ON_ENABLED As Boolean,  _
                     ByVal Original_GUID As Integer,  _
                     ByVal GUID As Integer) As Integer
             Me.Adapter.UpdateCommand.Parameters(0).Value = CType(PROFIL_ID,Integer)
@@ -20850,8 +20853,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Else
                 Me.Adapter.UpdateCommand.Parameters(30).Value = CType(SQL_ENABLE,String)
             End If
-            Me.Adapter.UpdateCommand.Parameters(31).Value = CType(Original_GUID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(32).Value = CType(GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(31).Value = CType(SAVE_CHANGE_ON_ENABLED,Boolean)
+            Me.Adapter.UpdateCommand.Parameters(32).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(33).Value = CType(GUID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
             If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -21080,7 +21084,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 command.Parameters(2).Value = CType(CTRL_TYPE,String)
             End If
             If (CTRL_TEXT Is Nothing) Then
-                command.Parameters(3).Value = Global.System.DBNull.Value
+                Throw New Global.System.ArgumentNullException("CTRL_TEXT")
             Else
                 command.Parameters(3).Value = CType(CTRL_TEXT,String)
             End If
@@ -21328,11 +21332,12 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 "ED_WHEN = @CHANGED_WHEN, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_M"& _ 
                 "ESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         SEQU"& _ 
                 "ENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LO"& _ 
-                "OKUP"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Original_GUID); "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNA"& _ 
-                "ME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_C"& _ 
-                "OMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_W"& _ 
-                "HEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, A"& _ 
-                "DVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID)"
+                "OKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @Or"& _ 
+                "iginal_GUID);  "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBR"& _ 
+                "EITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_V"& _ 
+                "ALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSA"& _ 
+                "GE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONT"& _ 
+                "ROL_TABLE WHERE (GUID = @GUID)"
             Me._adapter.UpdateCommand.CommandType = Global.System.Data.CommandType.Text
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SPALTENNAME", Global.System.Data.SqlDbType.VarChar, 100, Global.System.Data.ParameterDirection.Input, 0, 0, "SPALTENNAME", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -21341,7 +21346,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@VALIDATION", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "VALIDATION", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CHOICE_LIST", Global.System.Data.SqlDbType.VarChar, 50, Global.System.Data.ParameterDirection.Input, 0, 0, "CHOICE_LIST", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@CONNECTION_ID", Global.System.Data.SqlDbType.SmallInt, 2, Global.System.Data.ParameterDirection.Input, 0, 0, "CONNECTION_ID", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
-            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SQL_COMMAND", Global.System.Data.SqlDbType.NVarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "SQL_COMMAND", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@READ_ONLY", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "READ_ONLY", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@LOAD_IDX_VALUE", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "LOAD_IDX_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADDED_WHO", Global.System.Data.SqlDbType.VarChar, 30, Global.System.Data.ParameterDirection.Input, 0, 0, "ADDED_WHO", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
@@ -21354,6 +21359,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SEQUENCE", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "SEQUENCE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@DEFAULT_VALUE", Global.System.Data.SqlDbType.VarChar, 2147483647, Global.System.Data.ParameterDirection.Input, 0, 0, "DEFAULT_VALUE", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@ADVANCED_LOOKUP", Global.System.Data.SqlDbType.Bit, 1, Global.System.Data.ParameterDirection.Input, 0, 0, "ADVANCED_LOOKUP", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
+            Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@SAVE_CHANGE_ON_ENABLED", Global.System.Data.SqlDbType.[Variant], 1024, Global.System.Data.ParameterDirection.Input, 0, 0, "SAVE_CHANGE_ON_ENABLED", Global.System.Data.DataRowVersion.Current, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.UpdateCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@GUID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
         End Sub
@@ -21632,6 +21638,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
                     ByVal SEQUENCE As Integer,  _
                     ByVal DEFAULT_VALUE As String,  _
                     ByVal ADVANCED_LOOKUP As Boolean,  _
+                    ByVal SAVE_CHANGE_ON_ENABLED As Object,  _
                     ByVal Original_GUID As Integer,  _
                     ByVal GUID As Integer) As Integer
             Me.Adapter.UpdateCommand.Parameters(0).Value = CType(CONTROL_ID,Integer)
@@ -21697,13 +21704,18 @@ Namespace DD_DMSLiteDataSetTableAdapters
             End If
             Me.Adapter.UpdateCommand.Parameters(17).Value = CType(SEQUENCE,Integer)
             If (DEFAULT_VALUE Is Nothing) Then
-                Me.Adapter.UpdateCommand.Parameters(18).Value = Global.System.DBNull.Value
+                Throw New Global.System.ArgumentNullException("DEFAULT_VALUE")
             Else
                 Me.Adapter.UpdateCommand.Parameters(18).Value = CType(DEFAULT_VALUE,String)
             End If
             Me.Adapter.UpdateCommand.Parameters(19).Value = CType(ADVANCED_LOOKUP,Boolean)
-            Me.Adapter.UpdateCommand.Parameters(20).Value = CType(Original_GUID,Integer)
-            Me.Adapter.UpdateCommand.Parameters(21).Value = CType(GUID,Integer)
+            If (SAVE_CHANGE_ON_ENABLED Is Nothing) Then
+                Throw New Global.System.ArgumentNullException("SAVE_CHANGE_ON_ENABLED")
+            Else
+                Me.Adapter.UpdateCommand.Parameters(20).Value = CType(SAVE_CHANGE_ON_ENABLED,Object)
+            End If
+            Me.Adapter.UpdateCommand.Parameters(21).Value = CType(Original_GUID,Integer)
+            Me.Adapter.UpdateCommand.Parameters(22).Value = CType(GUID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.UpdateCommand.Connection.State
             If ((Me.Adapter.UpdateCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -21776,7 +21788,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
                 command.Parameters(9).Value = CType(REGEX_MESSAGE_DE,String)
             End If
             If (DEFAULT_VALUE Is Nothing) Then
-                command.Parameters(10).Value = Global.System.DBNull.Value
+                Throw New Global.System.ArgumentNullException("DEFAULT_VALUE")
             Else
                 command.Parameters(10).Value = CType(DEFAULT_VALUE,String)
             End If

app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd

@@ -957,7 +957,7 @@ WHERE        (PROFIL_ID = @P_ID) AND (CTRL_TYPE &lt;&gt; 'LBL')</CommandText>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBPM_PROFILE_CONTROLSTableAdapter" GeneratorDataComponentClassName="TBPM_PROFILE_CONTROLSTableAdapter" Name="TBPM_PROFILE_CONTROLS" UserDataComponentName="TBPM_PROFILE_CONTROLSTableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBPM_PROFILE_CONTROLS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM TBPM_PROFILE_CONTROLS
@@ -968,48 +968,49 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>INSERT INTO TBPM_PROFILE_CONTROLS
                          (PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, 
                          HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, 
-                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE)
-VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE);  
+                         REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SAVE_CHANGE_ON_ENABLED)
+VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@ADDED_WHEN,@CHANGED_WHO,@CHANGED_WHEN,@INDEX_NAME,@TYP,@VALIDATION,@CHOICE_LIST,@CONNECTION_ID,@SQL_UEBERPRUEFUNG,@HEIGHT,@WIDTH,@FONT_STYLE,@FONT_SIZE,@FONT_FAMILY,@FONT_COLOR,@READ_ONLY,@LOAD_IDX_VALUE,@DEFAULT_VALUE,@MULTISELECT,@VKT_ADD_ITEM,@VKT_PREVENT_MULTIPLE_VALUES,@REGEX_MATCH,@REGEX_MESSAGE_DE,@REGEX_MESSAGE_EN,@IMAGE_CONTROL,@SQL2,@SQL_ENABLE,@SAVE_CHANGE_ON_ENABLED);   
 SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = SCOPE_IDENTITY()) ORDER BY Y_LOC, X_LOC</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TYPE" ColumnName="CTRL_TYPE" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="CTRL_TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TEXT" ColumnName="CTRL_TEXT" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CTRL_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="X_LOC" ColumnName="X_LOC" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@X_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="X_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Y_LOC" ColumnName="Y_LOC" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Y_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="Y_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="INDEX_NAME" ColumnName="INDEX_NAME" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@INDEX_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="INDEX_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TYP" ColumnName="TYP" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@TYP" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="TYP" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION" ColumnName="VALIDATION" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VALIDATION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VALIDATION" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHOICE_LIST" ColumnName="CHOICE_LIST" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHOICE_LIST" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHOICE_LIST" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CONNECTION_ID" ColumnName="CONNECTION_ID" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_UEBERPRUEFUNG" ColumnName="SQL_UEBERPRUEFUNG" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_UEBERPRUEFUNG" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="SQL_UEBERPRUEFUNG" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="HEIGHT" ColumnName="HEIGHT" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@HEIGHT" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="HEIGHT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="WIDTH" ColumnName="WIDTH" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@WIDTH" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="WIDTH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_STYLE" ColumnName="FONT_STYLE" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@FONT_STYLE" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="FONT_STYLE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_SIZE" ColumnName="FONT_SIZE" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@FONT_SIZE" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="FONT_SIZE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_FAMILY" ColumnName="FONT_FAMILY" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@FONT_FAMILY" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="FONT_FAMILY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_COLOR" ColumnName="FONT_COLOR" DataSourceName="" DataTypeServer="bigint" DbType="Int64" Direction="Input" ParameterName="@FONT_COLOR" Precision="0" ProviderType="BigInt" Scale="0" Size="8" SourceColumn="FONT_COLOR" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="READ_ONLY" ColumnName="READ_ONLY" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_IDX_VALUE" ColumnName="LOAD_IDX_VALUE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_IDX_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_IDX_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="MULTISELECT" ColumnName="MULTISELECT" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@MULTISELECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="MULTISELECT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VKT_ADD_ITEM" ColumnName="VKT_ADD_ITEM" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VKT_ADD_ITEM" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VKT_ADD_ITEM" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VKT_PREVENT_MULTIPLE_VALUES" ColumnName="VKT_PREVENT_MULTIPLE_VALUES" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VKT_PREVENT_MULTIPLE_VALUES" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VKT_PREVENT_MULTIPLE_VALUES" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="REGEX_MATCH" ColumnName="REGEX_MATCH" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="IMAGE_CONTROL" ColumnName="IMAGE_CONTROL" DataSourceName="" DataTypeServer="varbinary(MAX)" DbType="Binary" Direction="Input" ParameterName="@IMAGE_CONTROL" Precision="0" ProviderType="VarBinary" Scale="0" Size="2147483647" SourceColumn="IMAGE_CONTROL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL2" ColumnName="SQL2" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@SQL2" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="SQL2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TYPE" ColumnName="CTRL_TYPE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="CTRL_TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TEXT" ColumnName="CTRL_TEXT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="CTRL_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="X_LOC" ColumnName="X_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@X_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="X_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Y_LOC" ColumnName="Y_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Y_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="Y_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHEN" ColumnName="ADDED_WHEN" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@ADDED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="ADDED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHEN" ColumnName="CHANGED_WHEN" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="datetime" DbType="DateTime" Direction="Input" ParameterName="@CHANGED_WHEN" Precision="0" ProviderType="DateTime" Scale="0" Size="8" SourceColumn="CHANGED_WHEN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="INDEX_NAME" ColumnName="INDEX_NAME" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@INDEX_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="INDEX_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TYP" ColumnName="TYP" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@TYP" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="TYP" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION" ColumnName="VALIDATION" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VALIDATION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VALIDATION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHOICE_LIST" ColumnName="CHOICE_LIST" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHOICE_LIST" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHOICE_LIST" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CONNECTION_ID" ColumnName="CONNECTION_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_UEBERPRUEFUNG" ColumnName="SQL_UEBERPRUEFUNG" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_UEBERPRUEFUNG" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_UEBERPRUEFUNG" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="HEIGHT" ColumnName="HEIGHT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@HEIGHT" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="HEIGHT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="WIDTH" ColumnName="WIDTH" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@WIDTH" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="WIDTH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_STYLE" ColumnName="FONT_STYLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@FONT_STYLE" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="FONT_STYLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_SIZE" ColumnName="FONT_SIZE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@FONT_SIZE" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="FONT_SIZE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_FAMILY" ColumnName="FONT_FAMILY" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@FONT_FAMILY" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="FONT_FAMILY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_COLOR" ColumnName="FONT_COLOR" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bigint" DbType="Int64" Direction="Input" ParameterName="@FONT_COLOR" Precision="0" ProviderType="BigInt" Scale="0" Size="8" SourceColumn="FONT_COLOR" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="READ_ONLY" ColumnName="READ_ONLY" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_IDX_VALUE" ColumnName="LOAD_IDX_VALUE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_IDX_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_IDX_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="MULTISELECT" ColumnName="MULTISELECT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@MULTISELECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="MULTISELECT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VKT_ADD_ITEM" ColumnName="VKT_ADD_ITEM" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VKT_ADD_ITEM" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VKT_ADD_ITEM" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VKT_PREVENT_MULTIPLE_VALUES" ColumnName="VKT_PREVENT_MULTIPLE_VALUES" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VKT_PREVENT_MULTIPLE_VALUES" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VKT_PREVENT_MULTIPLE_VALUES" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="REGEX_MATCH" ColumnName="REGEX_MATCH" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(1000)" DbType="String" Direction="Input" ParameterName="@REGEX_MATCH" Precision="0" ProviderType="NVarChar" Scale="0" Size="1000" SourceColumn="REGEX_MATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IMAGE_CONTROL" ColumnName="IMAGE_CONTROL" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varbinary(MAX)" DbType="Binary" Direction="Input" ParameterName="@IMAGE_CONTROL" Precision="0" ProviderType="VarBinary" Scale="0" Size="2147483647" SourceColumn="IMAGE_CONTROL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL2" ColumnName="SQL2" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -1018,59 +1019,61 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
                     <CommandText>SELECT        GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, 
                          SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, 
                          REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, IMAGE_CONTROL, SQL2, SQL_ENABLE, SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, 
-                         TABLE_ORDER_COLUMN
+                         TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED
 FROM            TBPM_PROFILE_CONTROLS
 WHERE        (GUID = @guid)
 ORDER BY Y_LOC, X_LOC</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="guid" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@guid" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="guid" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@guid" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
                 <UpdateCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="false">
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>UPDATE       TBPM_PROFILE_CONTROLS
 SET                PROFIL_ID = @PROFIL_ID, NAME = @NAME, CTRL_TYPE = @CTRL_TYPE, CTRL_TEXT = @CTRL_TEXT, X_LOC = @X_LOC, Y_LOC = @Y_LOC, CHANGED_WHO = @CHANGED_WHO, INDEX_NAME = @INDEX_NAME, 
                          TYP = @TYP, VALIDATION = @VALIDATION, CHOICE_LIST = @CHOICE_LIST, CONNECTION_ID = @CONNECTION_ID, SQL_UEBERPRUEFUNG = @SQL_UEBERPRUEFUNG, HEIGHT = @HEIGHT, WIDTH = @WIDTH, 
                          FONT_STYLE = @FONT_STYLE, FONT_SIZE = @FONT_SIZE, FONT_FAMILY = @FONT_FAMILY, FONT_COLOR = @FONT_COLOR, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, 
                          DEFAULT_VALUE = @DEFAULT_VALUE, MULTISELECT = @MULTISELECT, VKT_ADD_ITEM = @VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES = @VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH = @REGEX_MATCH, 
-                         REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, IMAGE_CONTROL = @IMAGE_CONTROL, SQL2 = @SQL2, SQL_ENABLE = @SQL_ENABLE
-WHERE        (GUID = @Original_GUID);  
+                         REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, IMAGE_CONTROL = @IMAGE_CONTROL, SQL2 = @SQL2, SQL_ENABLE = @SQL_ENABLE, 
+                         SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED
+WHERE        (GUID = @Original_GUID);   
 SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, INDEX_NAME, TYP, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_UEBERPRUEFUNG, HEIGHT, WIDTH, FONT_STYLE, FONT_SIZE, FONT_FAMILY, FONT_COLOR, READ_ONLY, LOAD_IDX_VALUE, DEFAULT_VALUE, MULTISELECT, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, REGEX_MATCH, REGEX_MESSAGE_DE, REGEX_MESSAGE_EN FROM TBPM_PROFILE_CONTROLS WHERE (GUID = @GUID) ORDER BY Y_LOC, X_LOC</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TYPE" ColumnName="CTRL_TYPE" DataSourceName="" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="CTRL_TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TEXT" ColumnName="CTRL_TEXT" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CTRL_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="X_LOC" ColumnName="X_LOC" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@X_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="X_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Y_LOC" ColumnName="Y_LOC" DataSourceName="" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Y_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="Y_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="INDEX_NAME" ColumnName="INDEX_NAME" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@INDEX_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="INDEX_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="TYP" ColumnName="TYP" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@TYP" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="TYP" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION" ColumnName="VALIDATION" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VALIDATION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VALIDATION" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CHOICE_LIST" ColumnName="CHOICE_LIST" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHOICE_LIST" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHOICE_LIST" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CONNECTION_ID" ColumnName="CONNECTION_ID" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_UEBERPRUEFUNG" ColumnName="SQL_UEBERPRUEFUNG" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_UEBERPRUEFUNG" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="SQL_UEBERPRUEFUNG" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="HEIGHT" ColumnName="HEIGHT" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@HEIGHT" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="HEIGHT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="WIDTH" ColumnName="WIDTH" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@WIDTH" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="WIDTH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_STYLE" ColumnName="FONT_STYLE" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@FONT_STYLE" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="FONT_STYLE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_SIZE" ColumnName="FONT_SIZE" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@FONT_SIZE" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="FONT_SIZE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_FAMILY" ColumnName="FONT_FAMILY" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@FONT_FAMILY" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="FONT_FAMILY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_COLOR" ColumnName="FONT_COLOR" DataSourceName="" DataTypeServer="bigint" DbType="Int64" Direction="Input" ParameterName="@FONT_COLOR" Precision="0" ProviderType="BigInt" Scale="0" Size="8" SourceColumn="FONT_COLOR" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="READ_ONLY" ColumnName="READ_ONLY" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_IDX_VALUE" ColumnName="LOAD_IDX_VALUE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_IDX_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_IDX_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="MULTISELECT" ColumnName="MULTISELECT" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@MULTISELECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="MULTISELECT" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VKT_ADD_ITEM" ColumnName="VKT_ADD_ITEM" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VKT_ADD_ITEM" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VKT_ADD_ITEM" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="VKT_PREVENT_MULTIPLE_VALUES" ColumnName="VKT_PREVENT_MULTIPLE_VALUES" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VKT_PREVENT_MULTIPLE_VALUES" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VKT_PREVENT_MULTIPLE_VALUES" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="REGEX_MATCH" ColumnName="REGEX_MATCH" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="IMAGE_CONTROL" ColumnName="IMAGE_CONTROL" DataSourceName="" DataTypeServer="varbinary(MAX)" DbType="Binary" Direction="Input" ParameterName="@IMAGE_CONTROL" Precision="0" ProviderType="VarBinary" Scale="0" Size="2147483647" SourceColumn="IMAGE_CONTROL" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL2" ColumnName="SQL2" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@SQL2" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="SQL2" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TYPE" ColumnName="CTRL_TYPE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="CTRL_TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TEXT" ColumnName="CTRL_TEXT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="CTRL_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="X_LOC" ColumnName="X_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@X_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="X_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Y_LOC" ColumnName="Y_LOC" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Y_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="Y_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHANGED_WHO" ColumnName="CHANGED_WHO" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@CHANGED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="CHANGED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="INDEX_NAME" ColumnName="INDEX_NAME" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@INDEX_NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="INDEX_NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="TYP" ColumnName="TYP" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@TYP" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="TYP" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION" ColumnName="VALIDATION" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VALIDATION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VALIDATION" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CHOICE_LIST" ColumnName="CHOICE_LIST" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHOICE_LIST" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHOICE_LIST" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="CONNECTION_ID" ColumnName="CONNECTION_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_UEBERPRUEFUNG" ColumnName="SQL_UEBERPRUEFUNG" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_UEBERPRUEFUNG" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_UEBERPRUEFUNG" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="HEIGHT" ColumnName="HEIGHT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@HEIGHT" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="HEIGHT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="WIDTH" ColumnName="WIDTH" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@WIDTH" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="WIDTH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_STYLE" ColumnName="FONT_STYLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@FONT_STYLE" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="FONT_STYLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_SIZE" ColumnName="FONT_SIZE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@FONT_SIZE" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="FONT_SIZE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_FAMILY" ColumnName="FONT_FAMILY" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@FONT_FAMILY" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="FONT_FAMILY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="FONT_COLOR" ColumnName="FONT_COLOR" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bigint" DbType="Int64" Direction="Input" ParameterName="@FONT_COLOR" Precision="0" ProviderType="BigInt" Scale="0" Size="8" SourceColumn="FONT_COLOR" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="READ_ONLY" ColumnName="READ_ONLY" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="LOAD_IDX_VALUE" ColumnName="LOAD_IDX_VALUE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_IDX_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_IDX_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="MULTISELECT" ColumnName="MULTISELECT" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@MULTISELECT" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="MULTISELECT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VKT_ADD_ITEM" ColumnName="VKT_ADD_ITEM" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VKT_ADD_ITEM" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VKT_ADD_ITEM" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="VKT_PREVENT_MULTIPLE_VALUES" ColumnName="VKT_PREVENT_MULTIPLE_VALUES" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VKT_PREVENT_MULTIPLE_VALUES" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VKT_PREVENT_MULTIPLE_VALUES" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="REGEX_MATCH" ColumnName="REGEX_MATCH" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(1000)" DbType="String" Direction="Input" ParameterName="@REGEX_MATCH" Precision="0" ProviderType="NVarChar" Scale="0" Size="1000" SourceColumn="REGEX_MATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="IMAGE_CONTROL" ColumnName="IMAGE_CONTROL" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varbinary(MAX)" DbType="Binary" Direction="Input" ParameterName="@IMAGE_CONTROL" Precision="0" ProviderType="VarBinary" Scale="0" Size="2147483647" SourceColumn="IMAGE_CONTROL" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL2" ColumnName="SQL2" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL2" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL2" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_ENABLE" ColumnName="SQL_ENABLE" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_ENABLE" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_ENABLE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </UpdateCommand>
@@ -1117,6 +1120,7 @@ SELECT GUID, PROFIL_ID, NAME, CTRL_TYPE, CTRL_TEXT, X_LOC, Y_LOC, ADDED_WHO, ADD
               <Mapping SourceColumn="SQL_ENABLE_ON_LOAD_CONID" DataSetColumn="SQL_ENABLE_ON_LOAD_CONID" />
               <Mapping SourceColumn="CONTROL_ACTIVE" DataSetColumn="CONTROL_ACTIVE" />
               <Mapping SourceColumn="TABLE_ORDER_COLUMN" DataSetColumn="TABLE_ORDER_COLUMN" />
+              <Mapping SourceColumn="SAVE_CHANGE_ON_ENABLED" DataSetColumn="SAVE_CHANGE_ON_ENABLED" />
             </Mappings>
             <Sources>
               <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="cmdControlExists" Modifier="Public" Name="cmdControlExists" QueryType="Scalar" ScalarCallRetval="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy" UserSourceName="cmdControlExists">
@@ -1214,7 +1218,7 @@ VALUES        (@PROFIL_ID,@NAME,@CTRL_TYPE,@CTRL_TEXT,@X_LOC,@Y_LOC,@ADDED_WHO,@
                       <Parameter AllowDbNull="false" AutogeneratedName="PROFIL_ID" ColumnName="PROFIL_ID" DataSourceName="DD_DMS.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@PROFIL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="NAME" ColumnName="NAME" DataSourceName="DD_DMS.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@NAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="NAME" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TYPE" ColumnName="CTRL_TYPE" DataSourceName="DD_DMS.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(10)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TYPE" Precision="0" ProviderType="VarChar" Scale="0" Size="10" SourceColumn="CTRL_TYPE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="CTRL_TEXT" ColumnName="CTRL_TEXT" DataSourceName="DD_DMS.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CTRL_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CTRL_TEXT" ColumnName="CTRL_TEXT" DataSourceName="DD_DMS.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CTRL_TEXT" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CTRL_TEXT" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="X_LOC" ColumnName="X_LOC" DataSourceName="DD_DMS.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@X_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="X_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="Y_LOC" ColumnName="Y_LOC" DataSourceName="DD_DMS.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="float" DbType="Double" Direction="Input" ParameterName="@Y_LOC" Precision="0" ProviderType="Float" Scale="0" Size="8" SourceColumn="Y_LOC" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_DMS.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1244,13 +1248,13 @@ WHERE        (GUID = @Original_GUID);</CommandText>
                     <CommandText>SELECT        dbo.FNPM_LANGUAGE_CONTROL_TEXT(NAME, @USER_LANGUAGE, CTRL_TYPE, CTRL_TEXT) AS CTRL_CAPTION_LANG, ADDED_WHEN, ADDED_WHO, CHANGED_WHEN, CHANGED_WHO, CHOICE_LIST, CONNECTION_ID, 
                          CTRL_TEXT, CTRL_TYPE, DEFAULT_VALUE, FONT_COLOR, FONT_FAMILY, FONT_SIZE, FONT_STYLE, GUID, HEIGHT, INDEX_NAME, LOAD_IDX_VALUE, MULTISELECT, NAME, PROFIL_ID, READ_ONLY, REGEX_MATCH, 
                          REGEX_MESSAGE_DE, REGEX_MESSAGE_EN, SQL_UEBERPRUEFUNG, TYP, VALIDATION, VKT_ADD_ITEM, VKT_PREVENT_MULTIPLE_VALUES, WIDTH, X_LOC, Y_LOC, IMAGE_CONTROL, SQL2, SQL_ENABLE, 
-                         SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN
+                         SET_CONTROL_DATA, SQL_ENABLE_ON_LOAD, SQL_ENABLE_ON_LOAD_CONID, CONTROL_ACTIVE, TABLE_ORDER_COLUMN, SAVE_CHANGE_ON_ENABLED
 FROM            TBPM_PROFILE_CONTROLS AS T
 WHERE        (PROFIL_ID = @profil_id)
 ORDER BY Y_LOC, X_LOC</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="USER_LANGUAGE" ColumnName="" DataSourceName="" DataTypeServer="unknown" DbType="AnsiString" Direction="Input" ParameterName="@USER_LANGUAGE" Precision="0" Scale="0" Size="1024" SourceColumn="" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="profil_id" ColumnName="PROFIL_ID" DataSourceName="DD_ECM_TEST.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@profil_id" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="profil_id" ColumnName="PROFIL_ID" DataSourceName="DD_ECM.dbo.TBPM_PROFILE_CONTROLS" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@profil_id" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="PROFIL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -1259,7 +1263,7 @@ ORDER BY Y_LOC, X_LOC</CommandText>
           </TableAdapter>
           <TableAdapter BaseClass="System.ComponentModel.Component" DataAccessorModifier="AutoLayout, AnsiClass, Class, Public" DataAccessorName="TBPM_CONTROL_TABLETableAdapter" GeneratorDataComponentClassName="TBPM_CONTROL_TABLETableAdapter" Name="TBPM_CONTROL_TABLE" UserDataComponentName="TBPM_CONTROL_TABLETableAdapter">
             <MainSource>
-              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
+              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="Fill" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetData" GeneratorSourceName="Fill" GetMethodModifier="Public" GetMethodName="GetData" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetData" UserSourceName="Fill">
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>DELETE FROM TBPM_CONTROL_TABLE
@@ -1270,18 +1274,18 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                   </DbCommand>
                 </DeleteCommand>
                 <InsertCommand>
-                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                  <DbCommand CommandType="Text" ModifiedByUser="false">
                     <CommandText>INSERT INTO TBPM_CONTROL_TABLE
                          (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, ADDED_WHO, TYPE_COLUMN)
 VALUES        (@CONTROL_ID,@SPALTENNAME,@SPALTEN_HEADER,@SPALTENBREITE,@ADDED_WHO,@TYPE_COLUMN);    
 SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = SCOPE_IDENTITY())</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENNAME" ColumnName="SPALTENNAME" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTENNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTENNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTEN_HEADER" ColumnName="SPALTEN_HEADER" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTEN_HEADER" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTEN_HEADER" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENBREITE" ColumnName="SPALTENBREITE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SPALTENBREITE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SPALTENBREITE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="false" AutogeneratedName="TYPE_COLUMN" ColumnName="TYPE_COLUMN" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@TYPE_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="TYPE_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENNAME" ColumnName="SPALTENNAME" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTENNAME" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTENNAME" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTEN_HEADER" ColumnName="SPALTEN_HEADER" DataSourceName="" DataTypeServer="varchar(100)" DbType="AnsiString" Direction="Input" ParameterName="@SPALTEN_HEADER" Precision="0" ProviderType="VarChar" Scale="0" Size="100" SourceColumn="SPALTEN_HEADER" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SPALTENBREITE" ColumnName="SPALTENBREITE" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SPALTENBREITE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SPALTENBREITE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="TYPE_COLUMN" ColumnName="TYPE_COLUMN" DataSourceName="" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@TYPE_COLUMN" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="TYPE_COLUMN" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </InsertCommand>
@@ -1292,7 +1296,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
 FROM            TBPM_CONTROL_TABLE
 WHERE        (CONTROL_ID = @CONTROL_ID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -1302,8 +1306,8 @@ WHERE        (CONTROL_ID = @CONTROL_ID)</CommandText>
 SET                CONTROL_ID = @CONTROL_ID, SPALTENNAME = @SPALTENNAME, SPALTEN_HEADER = @SPALTEN_HEADER, SPALTENBREITE = @SPALTENBREITE, VALIDATION = @VALIDATION, CHOICE_LIST = @CHOICE_LIST, 
                          CONNECTION_ID = @CONNECTION_ID, SQL_COMMAND = @SQL_COMMAND, READ_ONLY = @READ_ONLY, LOAD_IDX_VALUE = @LOAD_IDX_VALUE, ADDED_WHO = @ADDED_WHO, ADDED_WHEN = @ADDED_WHEN, 
                          CHANGED_WHO = @CHANGED_WHO, CHANGED_WHEN = @CHANGED_WHEN, REGEX_MATCH = @REGEX_MATCH, REGEX_MESSAGE_EN = @REGEX_MESSAGE_EN, REGEX_MESSAGE_DE = @REGEX_MESSAGE_DE, 
-                         SEQUENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP
-WHERE        (GUID = @Original_GUID); 
+                         SEQUENCE = @SEQUENCE, DEFAULT_VALUE = @DEFAULT_VALUE, ADVANCED_LOOKUP = @ADVANCED_LOOKUP, SAVE_CHANGE_ON_ENABLED = @SAVE_CHANGE_ON_ENABLED
+WHERE        (GUID = @Original_GUID);  
 SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED_WHO, ADDED_WHEN, CHANGED_WHO, CHANGED_WHEN, REGEX_MATCH, REGEX_MESSAGE_EN, REGEX_MESSAGE_DE, SEQUENCE, DEFAULT_VALUE, ADVANCED_LOOKUP FROM TBPM_CONTROL_TABLE WHERE (GUID = @GUID)</CommandText>
                     <Parameters>
                       <Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1313,7 +1317,7 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
                       <Parameter AllowDbNull="false" AutogeneratedName="VALIDATION" ColumnName="VALIDATION" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@VALIDATION" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="VALIDATION" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="CHOICE_LIST" ColumnName="CHOICE_LIST" DataSourceName="" DataTypeServer="varchar(50)" DbType="AnsiString" Direction="Input" ParameterName="@CHOICE_LIST" Precision="0" ProviderType="VarChar" Scale="0" Size="50" SourceColumn="CHOICE_LIST" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="true" AutogeneratedName="CONNECTION_ID" ColumnName="CONNECTION_ID" DataSourceName="" DataTypeServer="smallint" DbType="Int16" Direction="Input" ParameterName="@CONNECTION_ID" Precision="0" ProviderType="SmallInt" Scale="0" Size="2" SourceColumn="CONNECTION_ID" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_COMMAND" ColumnName="SQL_COMMAND" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@SQL_COMMAND" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="SQL_COMMAND" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="true" AutogeneratedName="SQL_COMMAND" ColumnName="SQL_COMMAND" DataSourceName="" DataTypeServer="nvarchar(MAX)" DbType="String" Direction="Input" ParameterName="@SQL_COMMAND" Precision="0" ProviderType="NVarChar" Scale="0" Size="2147483647" SourceColumn="SQL_COMMAND" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="READ_ONLY" ColumnName="READ_ONLY" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@READ_ONLY" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="READ_ONLY" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="LOAD_IDX_VALUE" ColumnName="LOAD_IDX_VALUE" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@LOAD_IDX_VALUE" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="LOAD_IDX_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="ADDED_WHO" ColumnName="ADDED_WHO" DataSourceName="" DataTypeServer="varchar(30)" DbType="AnsiString" Direction="Input" ParameterName="@ADDED_WHO" Precision="0" ProviderType="VarChar" Scale="0" Size="30" SourceColumn="ADDED_WHO" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1324,8 +1328,9 @@ SELECT GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALIDATION,
                       <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="ADVANCED_LOOKUP" ColumnName="ADVANCED_LOOKUP" DataSourceName="" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ADVANCED_LOOKUP" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ADVANCED_LOOKUP" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="SAVE_CHANGE_ON_ENABLED" ColumnName="SAVE_CHANGE_ON_ENABLED" DataSourceName="" DataTypeServer="unknown" DbType="Object" Direction="Input" ParameterName="@SAVE_CHANGE_ON_ENABLED" Precision="0" Scale="0" Size="1024" SourceColumn="SAVE_CHANGE_ON_ENABLED" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="Original_GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                       <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
@@ -1379,7 +1384,7 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                       <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MATCH" ColumnName="REGEX_MATCH" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MATCH" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MATCH" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_EN" ColumnName="REGEX_MESSAGE_EN" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_EN" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_EN" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="REGEX_MESSAGE_DE" ColumnName="REGEX_MESSAGE_DE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(1000)" DbType="AnsiString" Direction="Input" ParameterName="@REGEX_MESSAGE_DE" Precision="0" ProviderType="VarChar" Scale="0" Size="1000" SourceColumn="REGEX_MESSAGE_DE" SourceColumnNullMapping="false" SourceVersion="Current" />
-                      <Parameter AllowDbNull="true" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="DEFAULT_VALUE" ColumnName="DEFAULT_VALUE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(MAX)" DbType="AnsiString" Direction="Input" ParameterName="@DEFAULT_VALUE" Precision="0" ProviderType="VarChar" Scale="0" Size="2147483647" SourceColumn="DEFAULT_VALUE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="SEQUENCE" ColumnName="SEQUENCE" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@SEQUENCE" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="SEQUENCE" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="ADVANCED_LOOKUP" ColumnName="ADVANCED_LOOKUP" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="bit" DbType="Boolean" Direction="Input" ParameterName="@ADVANCED_LOOKUP" Precision="0" ProviderType="Bit" Scale="0" Size="1" SourceColumn="ADVANCED_LOOKUP" SourceColumnNullMapping="false" SourceVersion="Current" />
                       <Parameter AllowDbNull="false" AutogeneratedName="SUMMARY_FUNCTION" ColumnName="SUMMARY_FUNCTION" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="varchar(20)" DbType="AnsiString" Direction="Input" ParameterName="@SUMMARY_FUNCTION" Precision="0" ProviderType="VarChar" Scale="0" Size="20" SourceColumn="SUMMARY_FUNCTION" SourceColumnNullMapping="false" SourceVersion="Current" />
@@ -1419,7 +1424,7 @@ FROM            TBPM_CONTROL_TABLE</CommandText>
 FROM            TBPM_CONTROL_TABLE
 WHERE        (GUID = @GUID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="GUID" ColumnName="GUID" DataSourceName="DD_ECM.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@GUID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Current" />
                     </Parameters>
                   </DbCommand>
                 </SelectCommand>
@@ -2537,7 +2542,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
-              <xs:element name="CTRL_TEXT" msprop:Generator_ColumnVarNameInTable="columnCTRL_TEXT" msprop:Generator_ColumnPropNameInRow="CTRL_TEXT" msprop:Generator_ColumnPropNameInTable="CTRL_TEXTColumn" msprop:Generator_UserColumnName="CTRL_TEXT" minOccurs="0">
+              <xs:element name="CTRL_TEXT" msprop:Generator_ColumnVarNameInTable="columnCTRL_TEXT" msprop:Generator_ColumnPropNameInRow="CTRL_TEXT" msprop:Generator_ColumnPropNameInTable="CTRL_TEXTColumn" msprop:Generator_UserColumnName="CTRL_TEXT">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="100" />
@@ -2669,6 +2674,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
                   </xs:restriction>
                 </xs:simpleType>
               </xs:element>
+              <xs:element name="SAVE_CHANGE_ON_ENABLED" msprop:Generator_ColumnVarNameInTable="columnSAVE_CHANGE_ON_ENABLED" msprop:Generator_ColumnPropNameInRow="SAVE_CHANGE_ON_ENABLED" msprop:Generator_ColumnPropNameInTable="SAVE_CHANGE_ON_ENABLEDColumn" msprop:Generator_UserColumnName="SAVE_CHANGE_ON_ENABLED" type="xs:boolean" />
             </xs:sequence>
           </xs:complexType>
         </xs:element>
@@ -2748,7 +2754,7 @@ SELECT GUID, NAME, TITLE, PRIORITY, DESCRIPTION, ACTIVE, WD_SEARCH, NO_OF_DOCUME
                 </xs:simpleType>
               </xs:element>
               <xs:element name="SEQUENCE" msprop:Generator_ColumnVarNameInTable="columnSEQUENCE" msprop:Generator_ColumnPropNameInRow="SEQUENCE" msprop:Generator_ColumnPropNameInTable="SEQUENCEColumn" msprop:Generator_UserColumnName="SEQUENCE" type="xs:int" />
-              <xs:element name="DEFAULT_VALUE" msprop:Generator_ColumnVarNameInTable="columnDEFAULT_VALUE" msprop:Generator_ColumnPropNameInRow="DEFAULT_VALUE" msprop:Generator_ColumnPropNameInTable="DEFAULT_VALUEColumn" msprop:Generator_UserColumnName="DEFAULT_VALUE" minOccurs="0">
+              <xs:element name="DEFAULT_VALUE" msprop:Generator_ColumnVarNameInTable="columnDEFAULT_VALUE" msprop:Generator_ColumnPropNameInRow="DEFAULT_VALUE" msprop:Generator_ColumnPropNameInTable="DEFAULT_VALUEColumn" msprop:Generator_UserColumnName="DEFAULT_VALUE">
                 <xs:simpleType>
                   <xs:restriction base="xs:string">
                     <xs:maxLength value="2147483647" />

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="801" ViewPortY="-84" 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="801" ViewPortY="47" 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="14" X="1688" Y="-74" Height="324" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="197" />
     <Shape ID="DesignTable:TBPM_KONFIGURATION" ZOrder="2" 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

@@ -165,28 +165,31 @@
     </Reference>
     <Reference Include="DigitalData.Modules.Base, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDMonorepo\Modules.Base\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
+      <HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.Config">
-      <HintPath>..\..\..\DDMonorepo\Modules.Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Database, Version=2.1.4.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDMonorepo\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+      <HintPath>..\..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.EDMI.API">
-      <HintPath>..\..\..\DDMonorepo\Modules.EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Language">
-      <HintPath>..\..\..\DDMonorepo\Modules.Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
-    </Reference>
-    <Reference Include="DigitalData.Modules.Logging, Version=2.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDMonorepo\Modules.Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+      <HintPath>..\..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
     </Reference>
-    <Reference Include="DigitalData.Modules.ZooFlow, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DigitalData.Modules.EDMI.API, Version=1.5.4.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDMonorepo\Modules.ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
+      <HintPath>..\..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.ZooFlow, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll</HintPath>
     </Reference>
     <Reference Include="DLLLicenseManager">
       <HintPath>P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll</HintPath>
@@ -914,6 +917,23 @@
     <None Include="Resources\task.png" />
     <None Include="Resources\seach_typo.png" />
     <None Include="Resources\search.png" />
+    <None Include="Resources\save.svg" />
+    <None Include="Resources\color.svg" />
+    <None Include="Resources\textthatcontains.svg" />
+    <None Include="Resources\insertcombobox.svg" />
+    <None Include="Resources\actions_table.svg" />
+    <None Include="Resources\adateoccuring.svg" />
+    <None Include="Resources\checkbox.svg" />
+    <None Include="Resources\checkbox1.svg" />
+    <None Include="Resources\itemtypechecked.svg" />
+    <None Include="Resources\groupby.svg" />
+    <None Include="Resources\pencolor.svg" />
+    <None Include="Resources\chartdesigner.svg" />
+    <None Include="Resources\formatastable.svg" />
+    <None Include="Resources\chartdesigner1.svg" />
+    <None Include="Resources\chartdesigner2.svg" />
+    <None Include="Resources\cancel.svg" />
+    <None Include="Resources\publicfix_32x32.png" />
     <Content Include="task.ico" />
     <None Include="Resources\searchFlow_icon.png" />
     <None Include="Resources\taskFlow_icon.png" />

app/DD_PM_WINDREAM/ModuleControlProperties.vb

@@ -5,6 +5,7 @@ Imports System.Globalization
 Imports DigitalData.Modules.Language.Utils
 
 Public Module ModuleControlProperties
+
     Public Enum IndexTypes
         SimpleIndex = 0
         VectorIndex = 1
@@ -14,27 +15,28 @@ Public Module ModuleControlProperties
         Private _size As Size
         Private _font As Font
 
-
-        <Category("Allgemein")>
+        <DisplayName("Changed At")>
+        <Category(ClassConstants.CAT_INFORMATION)>
         <[ReadOnly](True)>
         Public Property ChangedAt As Date
 
-        <Category("Allgemein")>
+        <DisplayName("Changed Who")>
+        <Category(ClassConstants.CAT_INFORMATION)>
         <[ReadOnly](True)>
         Public Property ChangedWho As String
 
-        <Category("Allgemein")>
+        <Category(ClassConstants.CAT_GENERAL)>
         <[ReadOnly](True)>
         Public Property ID() As Integer
 
-        <Category("Allgemein")>
+        <Category(ClassConstants.CAT_GENERAL)>
         Public Property Name() As String
 
 
-        <Category("Anzeige")>
+        <Category(ClassConstants.CAT_DISPLAY)>
         Public Property Location() As Point
 
-        <Category("Anzeige")>
+        <Category(ClassConstants.CAT_DISPLAY)>
         Public Property Size() As Size
             Get
                 Return _size
@@ -52,7 +54,7 @@ Public Module ModuleControlProperties
             End Set
         End Property
 
-        <Category("Anzeige")>
+        <Category(ClassConstants.CAT_DISPLAY)>
         <TypeConverter(GetType(FontConverter))>
         Public Overridable Property Font As Font
             Get
@@ -63,7 +65,8 @@ Public Module ModuleControlProperties
             End Set
         End Property
 
-        <Category("Anzeige")>
+        <DisplayName("Font Color")>
+        <Category(ClassConstants.CAT_DISPLAY)>
         Public Property TextColor As Color
 
         Class FontConverter
@@ -81,18 +84,29 @@ Public Module ModuleControlProperties
 
         Private _index_type As String
         Private _sql_command As String
-        Private _Override_SQL As String
+        Friend _sql_connection As Integer = 0
         Private _Enable_SQL As String
         Private _Enable_SQL_ONLOAD As String
-
         Private _default_value
-        <Category("Allgemein")> Public Property Active() As Boolean
+        Friend _set_control_data As String
 
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
+        Public Property Active() As Boolean
+
+        <Category(ClassConstants.CAT_VALIDATION)>
         Public Property Required() As Boolean
-        <Category("Validierung")>
+
+        <DisplayName("Read Only")>
+        <Category(ClassConstants.CAT_VALIDATION)>
         Public Property [ReadOnly]() As Boolean
+
+        <DisplayName("Save Changes On Read Only")>
+        <Description("Stores data of Read Only fields when document is saved. Default behaviour is NOT to save Read Only fields.")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
+        Public Property [SaveChangeOnReadOnly]() As Boolean
+
         <Browsable(False)>
-        <Category("Indexierung")>
+        <Category(ClassConstants.CAT_GENERAL)>
         Public Property IndexType() As IndexTypes
         ''' <summary>
         ''' Diese Eigenschaft enthält die auswählbaren Indicies, die für das Control verfügbar sind. Wird nicht direkt angezeigt.
@@ -102,44 +116,62 @@ Public Module ModuleControlProperties
         ''' <summary>
         ''' Diese Eigenschaft enthält des ausgewählten Index
         ''' </summary>
-        <Category("Indexierung")>
+        <Category(ClassConstants.CAT_GENERAL)>
         <TypeConverter(GetType(IndexListConverter))>
         Public Property Index() As String
-        <Category("Daten")>
+
+        <DisplayName("SQL Command")>
+        <Category(ClassConstants.CAT_DATA)>
         Public Property SQLCommand() As SQLValue
             Get
-                Return New SQLValue(NotNull(_sql_command, ""))
+                Return New SQLValue(NotNull(_sql_command, ""), _sql_connection)
             End Get
             Set(ByVal value As SQLValue)
                 _sql_command = value.Value
-            End Set
-        End Property
-        Public Property Override_SQL() As SQLValue
-            Get
-                Return New SQLValue(NotNull(_Override_SQL, ""))
-            End Get
-            Set(ByVal value As SQLValue)
-                _Override_SQL = value.Value
-            End Set
-        End Property
-        Public Property Enable_SQL() As SQLValue
-            Get
-                Return New SQLValue(NotNull(_Enable_SQL, ""))
-            End Get
-            Set(ByVal value As SQLValue)
-                _Enable_SQL = value.Value
-            End Set
-        End Property
-        Public Property Enable_SQL_OnLoad() As SQLValue
-            Get
-                Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, ""))
-            End Get
-            Set(ByVal value As SQLValue)
-                _Enable_SQL_ONLOAD = value.Value
+                SQLConnection = value.ConnectionId
             End Set
         End Property
 
-        <Category("Daten")>
+        <DisplayName("SQL Connection")>
+        <Category(ClassConstants.CAT_INFORMATION)>
+        <[ReadOnly](True)>
+        Public Property SQLConnection() As Integer
+            Get
+                Return _sql_connection
+            End Get
+            Set(value As Integer)
+                _sql_connection = value
+            End Set
+        End Property
+
+        <DisplayName("Enable On Change SQL")>
+        <Description("SQL Command that determines if a control should be enabled/disabled when another, referenced control changes. Should return 0 or 1. Can include a Control-Placeholder.")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
+        Public Property Enable_SQL() As SQLValue
+            Get
+                Return New SQLValue(NotNull(_Enable_SQL, ""), _sql_connection)
+            End Get
+            Set(ByVal value As SQLValue)
+                _Enable_SQL = value.Value
+                SQLConnection = value.ConnectionId
+            End Set
+        End Property
+
+        <DisplayName("Enable On Load SQL")>
+        <Description("SQL Command that determines if a control should be enabled/disabled when the form loads. Should return 0 or 1. Can include a Control-Placeholder.")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
+        Public Property Enable_SQL_OnLoad() As SQLValue
+            Get
+                Return New SQLValue(NotNull(_Enable_SQL_ONLOAD, ""), _sql_connection)
+            End Get
+            Set(ByVal value As SQLValue)
+                _Enable_SQL_ONLOAD = value.Value
+                SQLConnection = value.ConnectionId
+            End Set
+        End Property
+
+        <DisplayName("Default Value")>
+        <Category(ClassConstants.CAT_DATA)>
         Public Property DefaultValue() As String
             Get
                 Return _default_value
@@ -150,15 +182,32 @@ Public Module ModuleControlProperties
         End Property
     End Class
 
-    Public Class TextboxProperties
+    Public Class InputPropertiesWithControlData
         Inherits InputProperties
-        <Category("Sonstiges")>
+
+        <DisplayName("Set Control Data SQL")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property SetControlData As SQLValue
-        <Category("Validierung")>
+            Get
+                Return New SQLValue(_set_control_data, _sql_connection)
+            End Get
+            Set(value As SQLValue)
+                _set_control_data = value.Value
+                SQLConnection = value.ConnectionId
+            End Set
+        End Property
+    End Class
+
+    Public Class TextboxProperties
+        Inherits InputPropertiesWithControlData
+
+        <DisplayName("Regex Pattern")>
+        <Category(ClassConstants.CAT_VALIDATION)>
         <Editor(GetType(ClassRegexEditor), GetType(UITypeEditor))>
         Public Property Regex As String
 
-        <Category("Validierung")>
+        <DisplayName("Regex Failure Message")>
+        <Category(ClassConstants.CAT_VALIDATION)>
         <Editor(GetType(MultilineStringEditor), GetType(UITypeEditor))>
         Public Property RegexMessage As String
     End Class
@@ -166,34 +215,34 @@ Public Module ModuleControlProperties
     Public Class LabelProperties
         Inherits BaseProperties
 
-        <Category("Allgemein")>
+        <Category(ClassConstants.CAT_DISPLAY)>
         Public Property Text() As String
     End Class
 
     Public Class CheckboxProperties
-        Inherits InputProperties
+        Inherits InputPropertiesWithControlData
 
-        <Category("Allgemein")>
+        <Category(ClassConstants.CAT_DISPLAY)>
         Public Property Text() As String
-        <Category("Sonstiges")>
-        Public Property SetControlData As SQLValue
+
     End Class
 
     Public Class ComboboxProperties
-        Inherits InputProperties
+        Inherits InputPropertiesWithControlData
 
-        <Category("Allgemein")>
+        <Category(ClassConstants.CAT_DISPLAY)>
         Public Property Text() As String
-        <Category("Sonstiges")>
-        Public Property SetControlData As SQLValue
 
         <Browsable(False)>
         Public Property ChoiceLists() As List(Of String)
 
-        <Category("Daten")>
+        <DisplayName("Static Choice List")>
+        <Category(ClassConstants.CAT_DATA)>
         <TypeConverter(GetType(ChoiceListConverter))>
         Public Property ChoiceList() As String
-        <Category("SpecialBehaviour")>
+
+        <DisplayName("Display As Lookup Control")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property DisplayAsLookUpControl As Boolean
 
         Public Class ChoiceListConverter
@@ -230,19 +279,22 @@ Public Module ModuleControlProperties
     Public Class GridControlProperties
         Inherits InputProperties
 
-        <Category("Einstellungen")>
+        <DisplayName("Allow Adding New Values")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property AllowAddNewValues As Boolean
     End Class
+
     Public Class ButtonProperties
         Inherits InputProperties
 
         Private _image_Value As String
+        Private _Override_SQL As String
 
-
-        <Category("Allgemein")>
+        <Category(ClassConstants.CAT_DISPLAY)>
         Public Property Text() As String
 
-        <Category("Image")>
+        <DisplayName("Image")>
+        <Category(ClassConstants.CAT_DISPLAY)>
         Public Property CtrlImage() As ImageValue
             Get
                 Return New ImageValue(NotNull(_image_Value, ""))
@@ -251,22 +303,42 @@ Public Module ModuleControlProperties
                 _image_Value = value.Value
             End Set
         End Property
+
+        <DisplayName("Completion Override SQL")>
+        <Category(ClassConstants.CAT_VALIDATION)>
+        Public Property Override_SQL() As SQLValue
+            Get
+                Return New SQLValue(NotNull(_Override_SQL, ""), _sql_connection)
+            End Get
+            Set(ByVal value As SQLValue)
+                _Override_SQL = value.Value
+                SQLConnection = value.ConnectionId
+            End Set
+        End Property
     End Class
+
     Public Class LookupControlProperties
-        Inherits InputProperties
+        Inherits InputPropertiesWithControlData
 
-        <Category("Einstellungen")>
+        <DisplayName("Multi Select")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property MultiSelect As Boolean
-        <Category("Einstellungen")>
-        Public Property AllowAddNewValues As Boolean
-        <Category("Einstellungen")>
-        Public Property PreventDuplicates As Boolean
-        Public Property ChoiceList() As String
-        <Category("SpecialBehaviour")>
-        Public Property DisplayAsComboBox As Boolean
-        <Category("Sonstiges")>
-        Public Property SetControlData As SQLValue
 
+        <DisplayName("Allow Adding New Values")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
+        Public Property AllowAddNewValues As Boolean
+
+        <DisplayName("Prevent Duplicates")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
+        Public Property PreventDuplicates As Boolean
+
+        <DisplayName("Static Choice List")>
+        <Category(ClassConstants.CAT_DATA)>
+        Public Property ChoiceList() As String
+
+        <DisplayName("Display As Combobox Control")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
+        Public Property DisplayAsComboBox As Boolean
     End Class
 
     Public Class LineLabelProperties

app/DD_PM_WINDREAM/ModuleFinalIndexProperties.vb

@@ -6,73 +6,85 @@ Imports FormsUtils
 Module ModuleFinalIndexProperties
     <TypeConverter(GetType(PropertiesDeluxeTypeConverter))>
     Public Class FinalIndexProperties
-        <Category("Information")>
+        <DisplayName("ID")>
+        <Category(ClassConstants.CAT_GENERAL)>
         <[ReadOnly](True)>
         Public Property GUID As Integer
-        <Category("Information")>
+
+        <DisplayName("Connection ID")>
+        <Category(ClassConstants.CAT_INFORMATION)>
         <[ReadOnly](True)>
         Public Property ConnectionId As Integer
 
-        <Category("Sonstiges")>
+        <Category(ClassConstants.CAT_GENERAL)>
         Public Property Description As String
-        <Category("Sonstiges")>
+
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property Active As Boolean
-        <Category("Sonstiges")>
+
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property Sequence As Integer = 0
-        <Category("Sonstiges")>
+
+        <DisplayName("Continue On Indifferent State")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
         Public Property ContinueOnIndifferentState As Boolean
+
         ''' <summary>
         ''' Eigenschaft, die den SQL Editor anzeigt
         ''' </summary>
-        <Category("Daten - SQL")>
+        <DisplayName("SQL Command")>
+        <Category(ClassConstants.CAT_DATA)>
         Public Property SQLCommand As SQLValue
 
         ' Eigenschaften für die verschiedenen Index-Typen
         <DisplayName("Value")>
-        <Category("Daten - Fester Wert")>
+        <Category(ClassConstants.CAT_DATA)>
         <PropertyAttributesProvider("IndexTypeStringProvider")>
         Public Property StringValue As String
 
         <DisplayName("Value")>
-        <Category("Daten - Fester Wert")>
+        <Category(ClassConstants.CAT_DATA)>
         <PropertyAttributesProvider("IndexTypeBooleanProvider")>
         Public Property BoolValue As Boolean
 
         <DisplayName("Value")>
-        <Category("Daten - Fester Wert")>
+        <Category(ClassConstants.CAT_DATA)>
         <PropertyAttributesProvider("IndexTypeFloatProvider")>
         Public Property FloatValue As Double
 
         <DisplayName("Value")>
-        <Category("Daten - Fester Wert")>
+        <Category(ClassConstants.CAT_DATA)>
         <PropertyAttributesProvider("IndexTypeDateProvider")>
         Public Property DateValue As Date
 
         <DisplayName("Value")>
-        <Category("Daten - Fester Wert")>
+        <Category(ClassConstants.CAT_DATA)>
         <PropertyAttributesProvider("IndexTypeIntegerProvider")>
         Public Property IntegerValue As Integer
 
-        <Category("Index")>
+        <DisplayName("Index")>
+        <Category(ClassConstants.CAT_GENERAL)>
         <TypeConverter(GetType(IndexListConverter))>
         Public Property IndexName As String
 
-        <Category("Index")>
+        <DisplayName("Vector Index")>
+        <Category(ClassConstants.CAT_INFORMATION)>
         <[ReadOnly](True)>
         Public Property VectorIndex As Boolean
 
-        <Category("Index")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
         <DisplayName("Allow Multivalues")>
         <PropertyAttributesProvider("VectorIndexBooleanProvider")>
         Public Property AllowAddNewValues As Boolean
 
-        <Category("Index")>
-        <DisplayName("IndexBehaviour")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
+        <DisplayName("Index Behaviour")>
         <TypeConverter(GetType(ClassVectorBehaviourListConverter))>
         <PropertyAttributesProvider("VectorIndexOnlyProvider")>
         Public Property VectorBehaviour As String
 
-        <Category("Index")>
+        <DisplayName("Prevent Duplicates")>
+        <Category(ClassConstants.CAT_BEHAVIOUR)>
         <PropertyAttributesProvider("VectorIndexBooleanProvider")>
         Public Property PreventDuplicates As Boolean
 

app/DD_PM_WINDREAM/ModuleMySettings.vb

@@ -1,37 +1,25 @@
 Module ModuleMySettings
     ' Connection String
-    Public SOURCE_INIT As Boolean = False
-    Public CONNECTION_STRING_ECM As String = ""
-    Public CONNECTION_STRING_IDB As String = ""
-    Public IDB_ACTIVE As Boolean = False
-    Public EDMIAppServerActive As Boolean = False
+    Public Property SOURCE_INIT As Boolean = False
+    Public Property CONNECTION_STRING_ECM As String = ""
+    Public Property CONNECTION_STRING_IDB As String = ""
+    Public Property IDB_ACTIVE As Boolean = False
+    Public Property EDMIAppServerActive As Boolean = False
 
-    Public OPERATION_MODE_FS As String = "PURE_WM"
-    Public IDB_USES_WMFILESTORE As Boolean = False
-    Public BASIC_CONF_VISIBLE As Boolean = True
-    Public IDB_DOC_DATA_SQL As String
-    Public IDB_DT_DOC_DATA As DataTable
-    Public TEST_MODE As String = False
-    Public NO_DETAIL_PROFILES As Boolean = False
-    Public DT_CONNECTIONS As DataTable
+    Public Property OPERATION_MODE_FS As String = "PURE_WM"
+    Public Property IDB_USES_WMFILESTORE As Boolean = False
+    Public Property BASIC_CONF_VISIBLE As Boolean = True
+    Public Property IDB_DOC_DATA_SQL As String
+    Public Property IDB_DT_DOC_DATA As DataTable
+    Public Property NO_DETAIL_PROFILES As Boolean = False
     ' Debug Settings
-    Public DEBUG As Boolean = False
+    Public Property DEBUG As Boolean = False
 
-    ' Viewer Settings
-    'Public VIEWER_UNIVERSAL As String = ""
-
-    'Public VIEWER_XCHANGE As String = ""
-    'Public VIEWER_SUMATRA As String = ""
-    'Public VIEWER_ZOOM_LEVEL As Integer = 3
-    'Public VIEWER_PDF As String = "internal"
-    'Public VIEWER_ALL As String = "docview"
-
-    Public INDEX_DMS_ERSTELLT = "DMS erstellt"
-    Public INDEX_DMS_ERSTELLT_ZEIT = "DMS erstellt (Zeit)"
-    Public USER_MANAGER_PATH = ""
+    Public Property INDEX_DMS_ERSTELLT = "DMS erstellt"
+    Public Property INDEX_DMS_ERSTELLT_ZEIT = "DMS erstellt (Zeit)"
 
     ' These settings are loaded from the database
-    Public VERSION_DELIMITER As String = "~"
-    Public FILE_DELIMITER As String = "_"
-    Public WMSESSION_STARTSTOP_STARTUP As Boolean = False
+    Public Property VERSION_DELIMITER As String = "~"
+    Public Property FILE_DELIMITER As String = "_"
+    Public Property WMSESSION_STARTSTOP_STARTUP As Boolean = False
 End Module

app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb

@@ -7,7 +7,6 @@ Imports DigitalData.Modules.ZooFlow
 
 Module ModuleRuntimeVariables
 
-    Public Property Database As DatabaseWithFallback
     Public Property DatabaseECM As MSSQLServer
     Public Property DatabaseIDB As MSSQLServer
     Public Property EDMIService As New State.ServiceState
@@ -29,7 +28,6 @@ Module ModuleRuntimeVariables
     Public Property CURRENT_ProfilGUID As Integer
     Public Property CURRENT_ProfilName As String
     Public Property CURRENT_PROFILE_LOG_INDEX As String
-    Public Property CURRENT_HTML_DOC As String
 
     Public Property CURRENT_DOC_GUID As Integer
     Public Property CURRENT_DOC_ID As Integer
@@ -38,8 +36,6 @@ Module ModuleRuntimeVariables
 
     Public Property CURRENT_CONVERSATION_NEW As Long
 
-    Public Property CURRENT_CONN_ID As Integer
-
     Public Property CURRENT_JUMP_DOC_GUID As Integer
     Public Property CURRENT_WMFILE As WMObject
 
@@ -47,7 +43,6 @@ Module ModuleRuntimeVariables
     Public Property ERROR_STATE = ""
 
     Public Property USER_USERNAME As String
-    Public Property DT_USER2MODULE As DataTable
 
     Public Property CHANGES_FORM_DESIGN As Boolean = False
 
@@ -77,7 +72,7 @@ Module ModuleRuntimeVariables
     Public Property WORKING_MODE As String = ""
     Public Property MONITORING_ACTIVE As Boolean = False
     Public Property GHOSTMODE_ACTIVE As Boolean = False
-    Public Property RIBBON_COLOR_SCHEME As String = "Blue"
+    Public Property RIBBON_COLOR_SCHEME As String = ""
     Public Property ADDITIONAL_TITLE As String = ""
     Public Property CONV_IDENTIFICATION As String = "Username"
     Public Property POPUP_REMINDER_ACTIVE As Boolean = True
@@ -89,7 +84,7 @@ Module ModuleRuntimeVariables
     Public Property SEARCH1 As String = ""
     Public Property SEARCH2 As String = ""
     Public Property TL_ICON As Boolean = True
-
+    Public Property TITLE_NOTIFICATIONS As String = ""
     Public Property START_CW As Boolean = False
     Public Property START_CW_CAPTION As String
     Public Property START_CW_LOC_VARIANT As String = 0
@@ -107,9 +102,6 @@ Module ModuleRuntimeVariables
     Public Property CURRENT_INDEX_ID As Integer
     Public Property CURRENT_OBJECTTYPE As String
     Public Property CURRENT_DESIGN_TYPE As String = "FINAL_INDEX"
-    Public Property CURRENT_SQL_CON As Integer
-    Public Property CURRENT_SQL_COMAMND As String
-    Public Property CURRENT_DT_SQL_CONFIG_TABLE As DataTable
 
     Public Property CURRENT_CLICKED_PROFILE_ID As Integer = 0
     Public Property CURRENT_CLICKED_PROFILE_TITLE As String
@@ -130,9 +122,7 @@ Module ModuleRuntimeVariables
     Public Property CURRENT_DT_PROFILES As DataTable
     Public Property CURRENT_DT_PROFILE As DataTable
 
-
-    Public CURRENT_INDEX_ARRAY(100, 250) As String
-
+    Public Property CURRENT_CONTROL_NAME_LIST As New List(Of String)
 
 
     Public Property DTVWCONTROLS_INDEX As DataTable

app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("TaskFlow")>
 <Assembly: AssemblyCopyright("Copyright © Digital Data 2022")>
-<Assembly: AssemblyTrademark("2353")>
+<Assembly: AssemblyTrademark("2.3.8.5")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 
 
-<Assembly: AssemblyVersion("2.3.7.6")>
+<Assembly: AssemblyVersion("2.3.8.5")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 

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

@@ -90,6 +90,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_table() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_table", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property adateoccuring() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("adateoccuring", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -251,12 +271,42 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
-        Friend ReadOnly Property Checkbox() As System.Drawing.Bitmap
+        Friend ReadOnly Property cancel1() As DevExpress.Utils.Svg.SvgImage
             Get
-                Dim obj As Object = ResourceManager.GetObject("Checkbox", resourceCulture)
-                Return CType(obj,System.Drawing.Bitmap)
+                Dim obj As Object = ResourceManager.GetObject("cancel1", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property chartdesigner() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("chartdesigner", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property chartdesigner1() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("chartdesigner1", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property chartdesigner2() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("chartdesigner2", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
             End Get
         End Property
         
@@ -270,6 +320,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property Checkboxbmp() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("Checkboxbmp", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -290,6 +350,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property color() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("color", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -600,6 +670,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property formatastable() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("formatastable", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -620,6 +700,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property groupby() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("groupby", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -690,6 +780,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property insertcombobox() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("insertcombobox", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property itemtypechecked() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("itemtypechecked", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -850,6 +960,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property pencolor() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("pencolor", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -880,6 +1000,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property publicfix_32x32() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("publicfix_32x32", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -960,6 +1090,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property save1() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("save1", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>
@@ -1160,6 +1300,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property textthatcontains() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("textthatcontains", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

app/DD_PM_WINDREAM/My Project/Resources.resx

@@ -121,14 +121,20 @@
   <data name="refresh_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\refresh_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Hammer_Builder_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Hammer_Builder_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <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="taskFlow_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\taskFlow_icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Security_Lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Security_Lock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="hide_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\hide_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -142,11 +148,8 @@
   <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>
-  <data name="DateOrTimePicker_675" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="DeleteFilter_5563" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DeleteFilter_5563.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="Image_File" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Image_File.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <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>
@@ -154,11 +157,11 @@
   <data name="SQL_Letters" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\SQL_Letters.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="seach_typo" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\seach_typo.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>
+  <data name="key_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="group_key" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\group_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -172,15 +175,15 @@
   <data name="Symbols_Information_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Symbols_Information_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="zoom_out1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\zoom_out1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="computer_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\computer_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="_blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="chartdesigner" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\chartdesigner.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <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>
@@ -196,12 +199,18 @@
   <data name="bo_unknown" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bo_unknown.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="Security_Lock" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Security_Lock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</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>
   <data name="Label_684" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <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="table_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -211,6 +220,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>
@@ -220,20 +232,23 @@
   <data name="database_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DD_Icons_ICO_CBWATCHER_48px" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DD_Icons_ICO_CBWATCHER_48px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="pencolor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pencolor.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="markcomplete" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\markcomplete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="seach_typo" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\seach_typo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="adateoccuring" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\adateoccuring.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="information" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\information.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="key_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\key_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="puzzle2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\puzzle2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="bullet_orange1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bullet_orange1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="magifier_zoom_out1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\magifier_zoom_out1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -244,9 +259,18 @@
   <data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="save1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="Open_6296" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Open_6296.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="dxf" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dxf.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="conversation" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\conversation.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ppt" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -259,23 +283,20 @@
   <data name="Properties" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Properties.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="bullet_green1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bullet_green1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="insertcombobox" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\insertcombobox.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="cancel1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cancel.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <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="Hammer_Builder_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Hammer_Builder_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="DD_Icons_ICO_CBWATCHER_48px" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DD_Icons_ICO_CBWATCHER_48px.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="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="bullet_orange1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bullet_orange1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="page_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\page_red.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>
@@ -283,11 +304,17 @@
   <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="actions_table" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_table.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="search_glyph" 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>
   </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 name="itemtypechecked" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\itemtypechecked.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="DeleteFilter_5563" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DeleteFilter_5563.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="database_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -295,24 +322,21 @@
   <data name="Security_Unlock" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Security_Unlock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="bullet_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bullet_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="resultset_last" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\resultset_last.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="book_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\book_open.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>
   </data>
+  <data name="user" 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>
+  </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="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="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>
   </data>
@@ -322,11 +346,14 @@
   <data name="Search(Go)_5718" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Search(Go)_5718.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Checkboxbmp" 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="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="puzzle2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\puzzle2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="DateOrTimePicker_675" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="ampel-gelb" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ampel-gelb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -334,8 +361,8 @@
   <data name="dtp" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dtp.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <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 name="book_open" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\book_open.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>
@@ -346,29 +373,35 @@
   <data name="TextBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TextBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="resultset_last" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\resultset_last.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <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>
   </data>
-  <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\delete.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="bullet_green1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bullet_green1.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>
+  <data name="groupby" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\groupby.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="page_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\page_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="color" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\color.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="hide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\hide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="chartdesigner1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\chartdesigner1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="database_link" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Open_6296" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Open_6296.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="show_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\show_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="lbl" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\lbl.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -379,23 +412,26 @@
   <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\show_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="cmb" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cmb.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="ID_FILE_PAGE_SETUP" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ID_FILE_PAGE_SETUP.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="flag_orange" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\flag_orange.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="taskflow_boot" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\taskflow_boot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="arrow_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\arrow_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="bullet_red" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bullet_red.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="resultset_previous" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\resultset_previous.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Image_File" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Image_File.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <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="textthatcontains" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\textthatcontains.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</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>
@@ -424,11 +460,14 @@
   <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="task" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\task.png;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>
-  <data name="conversation" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\conversation.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="taskflow_boot" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\taskflow_boot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Link_5762" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Link_5762.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -439,27 +478,33 @@
   <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">
-    <value>..\Resources\user.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <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="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>
   </data>
-  <data name="task" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\task.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <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="cmb" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\cmb.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="zoom_out1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zoom_out1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="chartdesigner2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\chartdesigner2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="formatastable" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\formatastable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <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="search" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\search.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="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="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>
@@ -472,7 +517,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" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\search.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="publicfix_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\publicfix_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

app/DD_PM_WINDREAM/My Project/licenses.licx

@@ -1,6 +1,13 @@
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

app/DD_PM_WINDREAM/Resources/actions_table.svg

@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="Table_2_">
+    <g class="st1">
+      <rect x="12" y="22" width="8" height="6" rx="0" ry="0" class="Black" />
+      <rect x="2" y="14" width="8" height="6" rx="0" ry="0" class="Black" />
+      <rect x="2" y="22" width="8" height="6" rx="0" ry="0" class="Black" />
+      <rect x="22" y="22" width="8" height="6" rx="0" ry="0" class="Black" />
+      <rect x="22" y="14" width="8" height="6" rx="0" ry="0" class="Black" />
+      <rect x="12" y="14" width="8" height="6" rx="0" ry="0" class="Black" />
+    </g>
+    <rect x="2" y="4" width="28" height="8" rx="0" ry="0" class="Blue" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/adateoccuring.svg

@@ -0,0 +1,18 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="A_Date_Occuring" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.5;}
+</style>
+  <path d="M28,8v18H4V8H2v19c0,0.6,0.4,1,1,1h26c0.6,0,1-0.4,1-1V8H28z" class="Black" />
+  <path d="M30,3v5H2V3c0-0.6,0.4-1,1-1h26C29.6,2,30,2.4,30,3z M12,18H8v4h4V18z" class="Red" />
+  <g class="st0">
+    <rect x="8" y="12" width="4" height="4" rx="0" ry="0" class="Black" />
+    <rect x="14" y="12" width="4" height="4" rx="0" ry="0" class="Black" />
+    <rect x="20" y="12" width="4" height="4" rx="0" ry="0" class="Black" />
+    <rect x="14" y="18" width="4" height="4" rx="0" ry="0" class="Black" />
+    <rect x="20" y="18" width="4" height="4" rx="0" ry="0" class="Black" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/cancel.svg

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Red{fill:#D11C1C;}
+</style>
+  <path d="M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M23,20l-3,3l-4-4l-4,4l-3-3l4-4l-4-4l3-3l4,4  l4-4l3,3l-4,4L23,20z" class="Red" />
+</svg>

app/DD_PM_WINDREAM/Resources/chartdesigner.svg

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+</style>
+  <g id="ChartDesigner">
+    <rect x="2" y="12" width="6" height="10" rx="0" ry="0" class="Blue" />
+    <polygon points="16,17.2 16,6 10,6 10,22 11.2,22  " class="Green" />
+    <polygon points="24,9.2 24,0 18,0 18,15.2  " class="Red" />
+    <path d="M6,30h26V4L6,30z M26,24h-5.5l5.5-5.5V24z" class="Yellow" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/chartdesigner1.svg

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+</style>
+  <g id="ChartDesigner">
+    <rect x="2" y="12" width="6" height="10" rx="0" ry="0" class="Blue" />
+    <polygon points="16,17.2 16,6 10,6 10,22 11.2,22  " class="Green" />
+    <polygon points="24,9.2 24,0 18,0 18,15.2  " class="Red" />
+    <path d="M6,30h26V4L6,30z M26,24h-5.5l5.5-5.5V24z" class="Yellow" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/chartdesigner2.svg

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+</style>
+  <g id="ChartDesigner">
+    <rect x="2" y="12" width="6" height="10" rx="0" ry="0" class="Blue" />
+    <polygon points="16,17.2 16,6 10,6 10,22 11.2,22  " class="Green" />
+    <polygon points="24,9.2 24,0 18,0 18,15.2  " class="Red" />
+    <path d="M6,30h26V4L6,30z M26,24h-5.5l5.5-5.5V24z" class="Yellow" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/checkbox.svg

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Yellow{fill:#FFB115;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+	.st2{opacity:0.25;}
+</style>
+  <g id="CheckBox">
+    <path d="M27,4H5C4.5,4,4,4.5,4,5v22c0,0.5,0.5,1,1,1h22c0.5,0,1-0.5,1-1V5C28,4.5,27.5,4,27,4z M14,22l-6-6l2-2l4,4   l8-8l2,2L14,22z" class="Green" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/checkbox1.svg

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Yellow{fill:#FFB115;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+	.st2{opacity:0.25;}
+</style>
+  <g id="CheckBox">
+    <path d="M27,4H5C4.5,4,4,4.5,4,5v22c0,0.5,0.5,1,1,1h22c0.5,0,1-0.5,1-1V5C28,4.5,27.5,4,27,4z M14,22l-6-6l2-2l4,4   l8-8l2,2L14,22z" class="Green" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/color.svg

@@ -0,0 +1,19 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#737374;}
+	.Yellow{fill:#FCB01B;}
+	.Green{fill:#129C49;}
+	.Blue{fill:#387CB7;}
+	.Red{fill:#D02127;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+	.st2{opacity:0.25;}
+	.st3{display:none;fill:#737374;}
+</style>
+  <path d="M24.3,20.7L18.3,4h-4.7L7.8,20.7H6.5c-0.3,0-0.5,0.2-0.5,0.5v2.4C6,23.8,6.2,24,6.5,24h7  c0.3,0,0.5-0.2,0.5-0.5v-2.4c0-0.3-0.2-0.5-0.5-0.5H12l0.7-2.2h6.5l0.7,2.2h-1.5c-0.3,0-0.5,0.2-0.5,0.5v2.4c0,0.3,0.2,0.5,0.5,0.5  h7c0.3,0,0.5-0.2,0.5-0.5v-2.4c0-0.3-0.2-0.5-0.5-0.5H24.3z M16,8.3L16,8.3l2.1,6.6h-4L16,8.3z" class="Black" />
+  <g class="st0">
+    <rect x="2" y="26" width="28" height="6" rx="0" ry="0" class="Black" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/formatastable.svg

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Format_As_Table" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Red{fill:#D11C1C;}
+	.Blue{fill:#1177D7;}
+	.st0{opacity:0.5;}
+</style>
+  <path d="M10,12h8v6h-8V12z M10,4v6h8V4H10z M8,10V4H0v6H8z M8,18v-6H0v6H8z" class="Blue" />
+  <g class="st0">
+    <path d="M10,25.4c1-1.5,2.2-2.9,4-3.3c0.1-0.7,0.4-1.3,0.8-1.8l0.3-0.3H10V25.4z M20,4v6h5.2l1.1-1.1   C26.8,8.4,27.4,8.1,28,8V4H20z M20,12v3.2l3.2-3.2H20z M0,26h8v-6H0V26z M28,26v-5.2L22.8,26H28z" class="Black" />
+  </g>
+  <path d="M23,23l8.7-8.7c0.4-0.4,0.4-1,0-1.3l-2.7-2.7c-0.4-0.4-1-0.4-1.3,0L19,19L23,23z" class="Red" />
+  <path d="M18,20l-1.7,1.7c-0.4,0.4-0.4,1,0,1.3l2.7,2.7c0.4,0.4,1,0.4,1.3,0L22,24L18,20z" class="Black" />
+  <path d="M15,24c3,3,0,0,3,3c-3,5-6,5-10,5C11,29,11.8,24,15,24z" class="Yellow" />
+</svg>

app/DD_PM_WINDREAM/Resources/groupby.svg

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Yellow{fill:#FFB115;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+	.st2{opacity:0.25;}
+</style>
+  <g id="GroupByField_1_">
+    <path d="M19,14H3c-0.5,0-1-0.4-1-1V5c0-0.6,0.5-1,1-1h16c0.5,0,1,0.4,1,1v8C20,13.6,19.5,14,19,14z M30,25v-8   c0-0.5-0.5-1-1-1H13c-0.6,0-1,0.5-1,1v8c0,0.5,0.4,1,1,1h16C29.5,26,30,25.5,30,25z" class="Blue" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/insertcombobox.svg

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.Red{fill:#D11C1C;}
+	.Yellow{fill:#FFB115;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+</style>
+  <g id="InsertComboBox">
+    <path d="M30,12H16H2V4h14V2H1C0.5,2,0,2.5,0,3v26c0,0.5,0.5,1,1,1h30c0.5,0,1-0.5,1-1V12H30z M30,28H2V14h28V28z    M26,20H6v-2h20V20z M26,24H6v-2h20V24z" class="Black" />
+    <path d="M31,2H16v12h15c0.5,0,1-0.5,1-1V3C32,2.5,31.5,2,31,2z M24,10l-4-4h8L24,10z" class="Blue" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/itemtypechecked.svg

@@ -0,0 +1,30 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.Red{fill:#D11C1C;}
+	.Yellow{fill:#FFB115;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+</style>
+  <g id="ItemTypeChecked">
+    <g>
+      <g>
+        <rect x="20" y="8" width="10" height="4" rx="0" ry="0" class="Black" />
+        <rect x="20" y="22" width="10" height="4" rx="0" ry="0" class="Black" />
+        <path d="M15,18H3c-0.5,0-1,0.5-1,1v12c0,0.5,0.5,1,1,1h12c0.5,0,1-0.5,1-1V19C16,18.5,15.5,18,15,18z M14,30H4V20     h10V30z" class="Black" />
+        <path d="M14,10.8V14H4V4h8.2l2-2H3C2.5,2,2,2.5,2,3v12c0,0.5,0.5,1,1,1h12c0.5,0,1-0.5,1-1V8.8L14,10.8z" class="Black" />
+      </g>
+      <g>
+        <rect x="20" y="8" width="10" height="4" rx="0" ry="0" class="Black" />
+        <rect x="20" y="22" width="10" height="4" rx="0" ry="0" class="Black" />
+        <path d="M15,18H3c-0.5,0-1,0.5-1,1v12c0,0.5,0.5,1,1,1h12c0.5,0,1-0.5,1-1V19C16,18.5,15.5,18,15,18z M14,30H4V20     h10V30z" class="Black" />
+        <path d="M14,10.8V14H4V4h8.2l2-2H3C2.5,2,2,2.5,2,3v12c0,0.5,0.5,1,1,1h12c0.5,0,1-0.5,1-1V8.8L14,10.8z" class="Black" />
+      </g>
+    </g>
+    <polygon points="6,5 6,8 10,12 18,4 18,1 10,9  " class="Green" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/pencolor.svg

@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Line_Color" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.st0{fill:none;}
+	.st1{opacity:0.25;}
+</style>
+  <path d="M17,11L7,21l-4-4L13,7L17,11z M18,10l1.7-1.7c0.4-0.4,0.4-1,0-1.3L17,4.3c-0.4-0.4-1-0.4-1.3,0L14,6L18,10z   M2,18v4h4L2,18z" class="Blue" />
+  <rect x="0" y="24" width="32" height="8" rx="0" ry="0" id="Indicator" class="st0" />
+  <g class="st1">
+    <path d="M0,23.9V32h32v-8.1H0z M30,30H2v-4h28V30z" class="Black" />
+  </g>
+</svg>

app/DD_PM_WINDREAM/Resources/save.svg

@@ -0,0 +1,16 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#737374;}
+	.Yellow{fill:#FCB01B;}
+	.Green{fill:#129C49;}
+	.Blue{fill:#387CB7;}
+	.Red{fill:#D02127;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+	.st2{opacity:0.25;}
+	.st3{display:none;fill:#737374;}
+</style>
+  <path d="M27,4h-3v10H8V4H5C4.4,4,4,4.4,4,5v22c0,0.6,0.4,1,1,1h22c0.6,0,1-0.4,1-1V5C28,4.4,27.6,4,27,4z M24,24H8v-6  h16V24z M10,4v8h10V4H10z M14,10h-2V6h2V10z" class="Black" />
+</svg>

app/DD_PM_WINDREAM/Resources/textthatcontains.svg

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Text_that_Contains" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+</style>
+  <path d="M29,2H1C0.4,2,0,2.4,0,3v24c0,0.6,0.4,1,1,1h28c0.6,0,1-0.4,1-1V3C30,2.4,29.6,2,29,2z M28,26H2V4h26V26z" class="Black" />
+  <path d="M23.1,12.9c-0.6-0.7-1.4-1.1-2.4-1.1c-1.1,0-2,0.5-2.7,1.4V8h-2v12l2,0v-0.9c0.5,0.8,1.3,1.1,2.3,1.1  c1.1,0,2-0.4,2.7-1.2c0.7-0.8,1-1.9,1-3.2C24,14.6,23.7,13.6,23.1,12.9z M21.4,17.9c-0.4,0.5-0.9,0.7-1.5,0.7c-0.5,0-1-0.2-1.3-0.6  c-0.4-0.4-0.5-0.8-0.5-1.4v-1c0-0.7,0.2-1.2,0.6-1.6c0.4-0.4,0.9-0.6,1.5-0.6c0.6,0,1,0.2,1.4,0.6c0.3,0.4,0.5,1,0.5,1.8  C21.9,16.7,21.7,17.4,21.4,17.9z M11,11.8c-1.1,0-2.1,0.3-3,0.8v1.8c0,0,1.7-1.1,2.6-1.1c1,0,1.5,0.5,1.5,1.5l-2.2,0.3  c-1.7,0.2-2.6,1.1-2.6,2.7c0,0.7,0.2,1.3,0.7,1.7C8.4,20,9,20.2,9.8,20.2c1,0,1.7-0.4,2.3-1.2v1H14v-5.2C14,12.8,13,11.8,11,11.8z   M10.3,18.6c-0.4,0-0.7-0.1-0.9-0.3C9.1,18.1,9,17.9,9,17.6c0-0.4,0.1-0.7,0.4-0.9c0.3-0.2,0.6-0.3,1.1-0.4l1.6-0.2v0.6  c0,0.6-0.2,1-0.5,1.4C11.2,18.4,10.8,18.6,10.3,18.6z" class="Blue" />
+</svg>

app/DD_PM_WINDREAM/frmColumn_Detail.Designer.vb

@@ -37,6 +37,7 @@ Partial Class frmColumn_Detail
         Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
+        Me.LU_CAPTIONTextBox = New System.Windows.Forms.TextBox()
         Me.TYPE_COLUMNComboBox = New System.Windows.Forms.ComboBox()
         Me.GUIDTextBox = New DevExpress.XtraEditors.TextEdit()
         Me.SPALTENNAMETextBox = New DevExpress.XtraEditors.TextEdit()
@@ -73,6 +74,7 @@ Partial Class frmColumn_Detail
         Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.LayoutControlItem16 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem14 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem15 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem17 = New DevExpress.XtraLayout.LayoutControlItem()
@@ -80,9 +82,7 @@ Partial Class frmColumn_Detail
         Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LU_CAPTIONTextBox = New System.Windows.Forms.TextBox()
         Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem()
-        Me.LayoutControlItem16 = New DevExpress.XtraLayout.LayoutControlItem()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -121,6 +121,7 @@ Partial Class frmColumn_Detail
         CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -129,7 +130,6 @@ Partial Class frmColumn_Detail
         CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'TBPM_CONTROL_TABLEBindingSource
@@ -252,6 +252,12 @@ Partial Class frmColumn_Detail
         Me.LayoutControl1.Name = "LayoutControl1"
         Me.LayoutControl1.Root = Me.Root
         '
+        'LU_CAPTIONTextBox
+        '
+        Me.LU_CAPTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "LU_CAPTION", True))
+        resources.ApplyResources(Me.LU_CAPTIONTextBox, "LU_CAPTIONTextBox")
+        Me.LU_CAPTIONTextBox.Name = "LU_CAPTIONTextBox"
+        '
         'TYPE_COLUMNComboBox
         '
         Me.TYPE_COLUMNComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "TYPE_COLUMN", True))
@@ -575,6 +581,15 @@ Partial Class frmColumn_Detail
         Me.LayoutControlGroup1.Size = New System.Drawing.Size(553, 156)
         resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
         '
+        'LayoutControlItem16
+        '
+        Me.LayoutControlItem16.Control = Me.VALIDATIONCheckbox
+        Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem16.Name = "LayoutControlItem16"
+        Me.LayoutControlItem16.Size = New System.Drawing.Size(264, 24)
+        Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem16.TextVisible = False
+        '
         'LayoutControlItem14
         '
         Me.LayoutControlItem14.Control = Me.READ_ONLYCheckBox
@@ -641,12 +656,6 @@ Partial Class frmColumn_Detail
         Me.LayoutControlItem22.Size = New System.Drawing.Size(553, 41)
         Me.LayoutControlItem22.TextSize = New System.Drawing.Size(112, 13)
         '
-        'LU_CAPTIONTextBox
-        '
-        Me.LU_CAPTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "LU_CAPTION", True))
-        resources.ApplyResources(Me.LU_CAPTIONTextBox, "LU_CAPTIONTextBox")
-        Me.LU_CAPTIONTextBox.Name = "LU_CAPTIONTextBox"
-        '
         'LayoutControlItem23
         '
         Me.LayoutControlItem23.Control = Me.LU_CAPTIONTextBox
@@ -657,15 +666,6 @@ Partial Class frmColumn_Detail
         Me.LayoutControlItem23.Size = New System.Drawing.Size(553, 40)
         Me.LayoutControlItem23.TextSize = New System.Drawing.Size(112, 13)
         '
-        'LayoutControlItem16
-        '
-        Me.LayoutControlItem16.Control = Me.VALIDATIONCheckbox
-        Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 0)
-        Me.LayoutControlItem16.Name = "LayoutControlItem16"
-        Me.LayoutControlItem16.Size = New System.Drawing.Size(264, 24)
-        Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0)
-        Me.LayoutControlItem16.TextVisible = False
-        '
         'frmColumn_Detail
         '
         Me.Appearance.Options.UseFont = True
@@ -680,7 +680,6 @@ Partial Class frmColumn_Detail
         Me.Name = "frmColumn_Detail"
         Me.Ribbon = Me.RibbonControl1
         Me.StatusBar = Me.RibbonStatusBar1
-        Me.TopMost = True
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -719,6 +718,7 @@ Partial Class frmColumn_Detail
         CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem14, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem15, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem17, System.ComponentModel.ISupportInitialize).EndInit()
@@ -727,7 +727,6 @@ Partial Class frmColumn_Detail
         CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem16, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout
 

app/DD_PM_WINDREAM/frmColumn_Detail.resx

@@ -952,6 +952,12 @@
   <data name="&gt;&gt;LayoutControlGroup1.Type" xml:space="preserve">
     <value>DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;LayoutControlItem16.Name" xml:space="preserve">
+    <value>LayoutControlItem16</value>
+  </data>
+  <data name="&gt;&gt;LayoutControlItem16.Type" xml:space="preserve">
+    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;LayoutControlItem14.Name" xml:space="preserve">
     <value>LayoutControlItem14</value>
   </data>
@@ -1000,12 +1006,6 @@
   <data name="&gt;&gt;LayoutControlItem23.Type" xml:space="preserve">
     <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;LayoutControlItem16.Name" xml:space="preserve">
-    <value>LayoutControlItem16</value>
-  </data>
-  <data name="&gt;&gt;LayoutControlItem16.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmColumn_Detail</value>
   </data>

app/DD_PM_WINDREAM/frmError.vb

@@ -7,7 +7,7 @@ Public Class frmError
     End Sub
 
     Private Sub frmError_Load(sender As Object, e As System.EventArgs) Handles Me.Load
-        Me.txterror.Text =errormessage
+        Me.txterror.Text = errormessage
         Me.Label1.Focus()
         Me.Timer1.Start()
     End Sub

app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb

@@ -27,16 +27,7 @@ Partial Class frmFormDesigner
         Me.SplitContainerDesigner = New System.Windows.Forms.SplitContainer()
         Me.pnldesigner = New DigitalData.Controls.SnapPanel.ClassSnapPanel()
         Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.pgControls = New System.Windows.Forms.PropertyGrid()
-        Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet()
-        Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
-        Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
-        Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem()
-        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+        Me.pgControlsNew = New DevExpress.XtraVerticalGrid.PropertyGridControl()
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.bbtnItemFinishSQL = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
@@ -57,13 +48,20 @@ Partial Class frmFormDesigner
         Me.bbtniwidth_min = New DevExpress.XtraBars.BarButtonItem()
         Me.bbtniheight_plus = New DevExpress.XtraBars.BarButtonItem()
         Me.bbtniheight_min = New DevExpress.XtraBars.BarButtonItem()
-        Me.RibbonPageCategory1 = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
+        Me.tslblAenderungen = New DevExpress.XtraBars.BarStaticItem()
         Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.rpggrp_controls = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonGroupControlFunctions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonGroupControls = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibPGCtrlWidth = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibPGCtrlheight = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+        Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet()
+        Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
+        Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem()
         Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter()
         Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
         Me.TBDD_CONNECTIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter()
@@ -80,12 +78,12 @@ Partial Class frmFormDesigner
         Me.SplitContainerDesigner.Panel2.SuspendLayout()
         Me.SplitContainerDesigner.SuspendLayout()
         Me.Panel1.SuspendLayout()
+        CType(Me.pgControlsNew, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.StatusStrip1.SuspendLayout()
         Me.GridControlContextMenu.SuspendLayout()
-        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -112,70 +110,31 @@ Partial Class frmFormDesigner
         '
         'Panel1
         '
-        Me.Panel1.Controls.Add(Me.pgControls)
+        Me.Panel1.Controls.Add(Me.pgControlsNew)
         resources.ApplyResources(Me.Panel1, "Panel1")
         Me.Panel1.Name = "Panel1"
         '
-        'pgControls
+        'pgControlsNew
         '
-        resources.ApplyResources(Me.pgControls, "pgControls")
-        Me.pgControls.Name = "pgControls"
-        '
-        'TBPM_PROFILE_CONTROLSBindingSource
-        '
-        Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS"
-        Me.TBPM_PROFILE_CONTROLSBindingSource.DataSource = Me.DD_DMSLiteDataSet
-        '
-        'DD_DMSLiteDataSet
-        '
-        Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet"
-        Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
-        '
-        'TBDD_CONNECTIONBindingSource
-        '
-        Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION"
-        Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet
-        '
-        'StatusStrip1
-        '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen})
-        resources.ApplyResources(Me.StatusStrip1, "StatusStrip1")
-        Me.StatusStrip1.Name = "StatusStrip1"
-        '
-        'tslblAenderungen
-        '
-        Me.tslblAenderungen.Image = Global.DD_ProcessManager.My.Resources.Resources.database_save
-        Me.tslblAenderungen.Name = "tslblAenderungen"
-        resources.ApplyResources(Me.tslblAenderungen, "tslblAenderungen")
-        '
-        'GridControlContextMenu
-        '
-        Me.GridControlContextMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenuItemAddColumn})
-        Me.GridControlContextMenu.Name = "ContextMenuStrip1"
-        resources.ApplyResources(Me.GridControlContextMenu, "GridControlContextMenu")
-        '
-        'MenuItemAddColumn
-        '
-        Me.MenuItemAddColumn.Name = "MenuItemAddColumn"
-        resources.ApplyResources(Me.MenuItemAddColumn, "MenuItemAddColumn")
-        '
-        'RibbonStatusBar1
-        '
-        resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
-        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
-        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        Me.pgControlsNew.Cursor = System.Windows.Forms.Cursors.Default
+        resources.ApplyResources(Me.pgControlsNew, "pgControlsNew")
+        Me.pgControlsNew.MenuManager = Me.RibbonControl1
+        Me.pgControlsNew.Name = "pgControlsNew"
+        Me.pgControlsNew.OptionsView.AllowReadOnlyRowAppearance = DevExpress.Utils.DefaultBoolean.[True]
         '
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.bbtnitLabel, Me.bbtnitTextBox, Me.bbtnitLU, Me.bbtnitTable, Me.bbtnitDatePicker, Me.bbtnitCheckBox, Me.bbtnitButton, Me.bbtnitLine, Me.bbtniwidth_plus, Me.bbtniwidth_min, Me.bbtniheight_plus, Me.bbtniheight_min})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1, Me.BarButtonItem4, Me.BarButtonItem5, Me.bbtnitLabel, Me.bbtnitTextBox, Me.bbtnitLU, Me.bbtnitTable, Me.bbtnitDatePicker, Me.bbtnitCheckBox, Me.bbtnitButton, Me.bbtnitLine, Me.bbtniwidth_plus, Me.bbtniwidth_min, Me.bbtniheight_plus, Me.bbtniheight_min, Me.tslblAenderungen})
         resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
-        Me.RibbonControl1.MaxItemId = 20
+        Me.RibbonControl1.MaxItemId = 21
         Me.RibbonControl1.Name = "RibbonControl1"
-        Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1})
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
+        Me.RibbonControl1.ShowToolbarCustomizeItem = False
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+        Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
         '
         'bbtnItemFinishSQL
         '
@@ -236,63 +195,56 @@ Partial Class frmFormDesigner
         '
         resources.ApplyResources(Me.bbtnitLabel, "bbtnitLabel")
         Me.bbtnitLabel.Id = 8
-        Me.bbtnitLabel.ImageOptions.Image = CType(resources.GetObject("bbtnitLabel.ImageOptions.Image"), System.Drawing.Image)
-        Me.bbtnitLabel.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitLabel.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.bbtnitLabel.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.color
         Me.bbtnitLabel.Name = "bbtnitLabel"
         '
         'bbtnitTextBox
         '
         resources.ApplyResources(Me.bbtnitTextBox, "bbtnitTextBox")
         Me.bbtnitTextBox.Id = 9
-        Me.bbtnitTextBox.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitTextBox.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.bbtnitTextBox.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.textthatcontains
         Me.bbtnitTextBox.Name = "bbtnitTextBox"
         '
         'bbtnitLU
         '
         resources.ApplyResources(Me.bbtnitLU, "bbtnitLU")
         Me.bbtnitLU.Id = 10
-        Me.bbtnitLU.ImageOptions.Image = CType(resources.GetObject("bbtnitLU.ImageOptions.Image"), System.Drawing.Image)
-        Me.bbtnitLU.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitLU.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.bbtnitLU.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.insertcombobox
         Me.bbtnitLU.Name = "bbtnitLU"
         '
         'bbtnitTable
         '
         resources.ApplyResources(Me.bbtnitTable, "bbtnitTable")
         Me.bbtnitTable.Id = 11
-        Me.bbtnitTable.ImageOptions.Image = CType(resources.GetObject("bbtnitTable.ImageOptions.Image"), System.Drawing.Image)
-        Me.bbtnitTable.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitTable.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.bbtnitTable.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.actions_table
         Me.bbtnitTable.Name = "bbtnitTable"
         '
         'bbtnitDatePicker
         '
         resources.ApplyResources(Me.bbtnitDatePicker, "bbtnitDatePicker")
         Me.bbtnitDatePicker.Id = 12
-        Me.bbtnitDatePicker.ImageOptions.Image = CType(resources.GetObject("bbtnitDatePicker.ImageOptions.Image"), System.Drawing.Image)
-        Me.bbtnitDatePicker.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitDatePicker.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.bbtnitDatePicker.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.adateoccuring
         Me.bbtnitDatePicker.Name = "bbtnitDatePicker"
         '
         'bbtnitCheckBox
         '
         resources.ApplyResources(Me.bbtnitCheckBox, "bbtnitCheckBox")
         Me.bbtnitCheckBox.Id = 13
-        Me.bbtnitCheckBox.ImageOptions.Image = CType(resources.GetObject("bbtnitCheckBox.ImageOptions.Image"), System.Drawing.Image)
-        Me.bbtnitCheckBox.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitCheckBox.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.bbtnitCheckBox.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.itemtypechecked
         Me.bbtnitCheckBox.Name = "bbtnitCheckBox"
         '
         'bbtnitButton
         '
         resources.ApplyResources(Me.bbtnitButton, "bbtnitButton")
         Me.bbtnitButton.Id = 14
-        Me.bbtnitButton.ImageOptions.Image = CType(resources.GetObject("bbtnitButton.ImageOptions.Image"), System.Drawing.Image)
-        Me.bbtnitButton.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitButton.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.bbtnitButton.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.groupby
         Me.bbtnitButton.Name = "bbtnitButton"
         '
         'bbtnitLine
         '
         resources.ApplyResources(Me.bbtnitLine, "bbtnitLine")
         Me.bbtnitLine.Id = 15
-        Me.bbtnitLine.ImageOptions.Image = CType(resources.GetObject("bbtnitLine.ImageOptions.Image"), System.Drawing.Image)
-        Me.bbtnitLine.ImageOptions.LargeImage = CType(resources.GetObject("bbtnitLine.ImageOptions.LargeImage"), System.Drawing.Image)
+        Me.bbtnitLine.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.pencolor
         Me.bbtnitLine.Name = "bbtnitLine"
         '
         'bbtniwidth_plus
@@ -323,14 +275,17 @@ Partial Class frmFormDesigner
         Me.bbtniheight_min.ImageOptions.SvgImage = CType(resources.GetObject("bbtniheight_min.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
         Me.bbtniheight_min.Name = "bbtniheight_min"
         '
-        'RibbonPageCategory1
+        'tslblAenderungen
         '
-        Me.RibbonPageCategory1.Name = "RibbonPageCategory1"
-        resources.ApplyResources(Me.RibbonPageCategory1, "RibbonPageCategory1")
+        resources.ApplyResources(Me.tslblAenderungen, "tslblAenderungen")
+        Me.tslblAenderungen.Id = 20
+        Me.tslblAenderungen.ImageOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.save1
+        Me.tslblAenderungen.Name = "tslblAenderungen"
+        Me.tslblAenderungen.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
         'RibbonPage1
         '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3, Me.rpggrp_controls, Me.RibPGCtrlWidth, Me.RibPGCtrlheight})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonGroupControlFunctions, Me.RibbonGroupControls, Me.RibPGCtrlWidth, Me.RibPGCtrlheight})
         Me.RibbonPage1.Name = "RibbonPage1"
         resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
         '
@@ -341,26 +296,25 @@ Partial Class frmFormDesigner
         Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
         resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
         '
-        'RibbonPageGroup3
+        'RibbonGroupControlFunctions
         '
-        Me.RibbonPageGroup3.Enabled = False
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3")
+        Me.RibbonGroupControlFunctions.ItemLinks.Add(Me.BarButtonItem2)
+        Me.RibbonGroupControlFunctions.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonGroupControlFunctions.Name = "RibbonGroupControlFunctions"
+        resources.ApplyResources(Me.RibbonGroupControlFunctions, "RibbonGroupControlFunctions")
         '
-        'rpggrp_controls
+        'RibbonGroupControls
         '
-        Me.rpggrp_controls.ItemLinks.Add(Me.bbtnitLabel)
-        Me.rpggrp_controls.ItemLinks.Add(Me.bbtnitTextBox)
-        Me.rpggrp_controls.ItemLinks.Add(Me.bbtnitLU)
-        Me.rpggrp_controls.ItemLinks.Add(Me.bbtnitTable)
-        Me.rpggrp_controls.ItemLinks.Add(Me.bbtnitDatePicker)
-        Me.rpggrp_controls.ItemLinks.Add(Me.bbtnitCheckBox)
-        Me.rpggrp_controls.ItemLinks.Add(Me.bbtnitButton)
-        Me.rpggrp_controls.ItemLinks.Add(Me.bbtnitLine)
-        Me.rpggrp_controls.Name = "rpggrp_controls"
-        resources.ApplyResources(Me.rpggrp_controls, "rpggrp_controls")
+        Me.RibbonGroupControls.ItemLinks.Add(Me.bbtnitLabel)
+        Me.RibbonGroupControls.ItemLinks.Add(Me.bbtnitTextBox)
+        Me.RibbonGroupControls.ItemLinks.Add(Me.bbtnitLU)
+        Me.RibbonGroupControls.ItemLinks.Add(Me.bbtnitTable)
+        Me.RibbonGroupControls.ItemLinks.Add(Me.bbtnitDatePicker)
+        Me.RibbonGroupControls.ItemLinks.Add(Me.bbtnitCheckBox)
+        Me.RibbonGroupControls.ItemLinks.Add(Me.bbtnitButton)
+        Me.RibbonGroupControls.ItemLinks.Add(Me.bbtnitLine)
+        Me.RibbonGroupControls.Name = "RibbonGroupControls"
+        resources.ApplyResources(Me.RibbonGroupControls, "RibbonGroupControls")
         '
         'RibPGCtrlWidth
         '
@@ -376,6 +330,39 @@ Partial Class frmFormDesigner
         Me.RibPGCtrlheight.Name = "RibPGCtrlheight"
         resources.ApplyResources(Me.RibPGCtrlheight, "RibPGCtrlheight")
         '
+        'RibbonStatusBar1
+        '
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.tslblAenderungen)
+        resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
+        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        '
+        'TBPM_PROFILE_CONTROLSBindingSource
+        '
+        Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS"
+        Me.TBPM_PROFILE_CONTROLSBindingSource.DataSource = Me.DD_DMSLiteDataSet
+        '
+        'DD_DMSLiteDataSet
+        '
+        Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet"
+        Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        '
+        'TBDD_CONNECTIONBindingSource
+        '
+        Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION"
+        Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet
+        '
+        'GridControlContextMenu
+        '
+        Me.GridControlContextMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenuItemAddColumn})
+        Me.GridControlContextMenu.Name = "ContextMenuStrip1"
+        resources.ApplyResources(Me.GridControlContextMenu, "GridControlContextMenu")
+        '
+        'MenuItemAddColumn
+        '
+        Me.MenuItemAddColumn.Name = "MenuItemAddColumn"
+        resources.ApplyResources(Me.MenuItemAddColumn, "MenuItemAddColumn")
+        '
         'TBPM_PROFILE_CONTROLSTableAdapter
         '
         Me.TBPM_PROFILE_CONTROLSTableAdapter.ClearBeforeFill = True
@@ -445,10 +432,10 @@ Partial Class frmFormDesigner
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.SplitContainerDesigner)
-        Me.Controls.Add(Me.StatusStrip1)
         Me.Controls.Add(Me.RibbonStatusBar1)
         Me.Controls.Add(Me.RibbonControl1)
         Me.IconOptions.Icon = CType(resources.GetObject("frmFormDesigner.IconOptions.Icon"), System.Drawing.Icon)
+        Me.IconOptions.SvgImage = Global.DD_ProcessManager.My.Resources.Resources.chartdesigner1
         Me.MinimizeBox = False
         Me.Name = "frmFormDesigner"
         Me.Ribbon = Me.RibbonControl1
@@ -459,13 +446,12 @@ Partial Class frmFormDesigner
         CType(Me.SplitContainerDesigner, System.ComponentModel.ISupportInitialize).EndInit()
         Me.SplitContainerDesigner.ResumeLayout(False)
         Me.Panel1.ResumeLayout(False)
+        CType(Me.pgControlsNew, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBDD_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.StatusStrip1.ResumeLayout(False)
-        Me.StatusStrip1.PerformLayout()
         Me.GridControlContextMenu.ResumeLayout(False)
-        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
@@ -476,8 +462,6 @@ Partial Class frmFormDesigner
     Friend WithEvents TBPM_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter
     Friend WithEvents TableAdapterManager As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager
-    Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
-    Friend WithEvents tslblAenderungen As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents TBDD_CONNECTIONBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBDD_CONNECTIONTableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter
     Friend WithEvents TBWH_CHECK_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource
@@ -485,7 +469,6 @@ Partial Class frmFormDesigner
     Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip
     Friend WithEvents TBPM_CONTROL_TABLEBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter
-    Friend WithEvents pgControls As PropertyGrid
     Friend WithEvents GridControlContextMenu As ContextMenuStrip
     Friend WithEvents MenuItemAddColumn As ToolStripMenuItem
     Friend WithEvents SplitContainerDesigner As SplitContainer
@@ -509,11 +492,10 @@ Partial Class frmFormDesigner
     Friend WithEvents bbtnitCheckBox As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents bbtnitButton As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents bbtnitLine As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageCategory1 As DevExpress.XtraBars.Ribbon.RibbonPageCategory
     Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonGroupControlFunctions As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
-    Friend WithEvents rpggrp_controls As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents RibbonGroupControls As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
     Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents bbtniwidth_plus As DevExpress.XtraBars.BarButtonItem
@@ -523,4 +505,6 @@ Partial Class frmFormDesigner
     Friend WithEvents RibPGCtrlWidth As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents RibPGCtrlheight As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents pnldesigner As DigitalData.Controls.SnapPanel.ClassSnapPanel
+    Friend WithEvents tslblAenderungen As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents pgControlsNew As DevExpress.XtraVerticalGrid.PropertyGridControl
 End Class

app/DD_PM_WINDREAM/frmFormDesigner.resx

@@ -123,7 +123,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="SplitContainerDesigner.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 146</value>
+    <value>0, 132</value>
   </data>
   <data name="pnldesigner.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -132,7 +132,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnldesigner.Size" type="System.Drawing.Size, System.Drawing">
-    <value>820, 420</value>
+    <value>820, 455</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="pnldesigner.TabIndex" type="System.Int32, mscorlib">
@@ -142,7 +142,7 @@
     <value>pnldesigner</value>
   </data>
   <data name="&gt;&gt;pnldesigner.Type" xml:space="preserve">
-    <value>DigitalData.Controls.SnapPanel.ClassSnapPanel, DigitalData.Controls.SnapPanel, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.SnapPanel.ClassSnapPanel, DigitalData.Controls.SnapPanel, Version=1.0.1.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;pnldesigner.Parent" xml:space="preserve">
     <value>SplitContainerDesigner.Panel1</value>
@@ -162,169 +162,19 @@
   <data name="&gt;&gt;SplitContainerDesigner.Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="pgControls.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+  <data name="pgControlsNew.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
-  <data name="pgControls.HelpVisible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="pgControls.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="pgControlsNew.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="pgControls.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 2, 3, 2</value>
-  </data>
-  <data name="pgControls.Size" type="System.Drawing.Size, System.Drawing">
-    <value>375, 420</value>
-  </data>
-  <data name="pgControls.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;pgControls.Name" xml:space="preserve">
-    <value>pgControls</value>
-  </data>
-  <data name="&gt;&gt;pgControls.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PropertyGrid, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;pgControls.Parent" xml:space="preserve">
-    <value>Panel1</value>
-  </data>
-  <data name="&gt;&gt;pgControls.ZOrder" xml:space="preserve">
-    <value>0</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, 2, 3, 2</value>
-  </data>
-  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>375, 420</value>
-  </data>
-  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>23</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>SplitContainerDesigner.Panel2</value>
-  </data>
-  <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;SplitContainerDesigner.Panel2.Name" xml:space="preserve">
-    <value>SplitContainerDesigner.Panel2</value>
-  </data>
-  <data name="&gt;&gt;SplitContainerDesigner.Panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;SplitContainerDesigner.Panel2.Parent" xml:space="preserve">
-    <value>SplitContainerDesigner</value>
-  </data>
-  <data name="&gt;&gt;SplitContainerDesigner.Panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="SplitContainerDesigner.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1199, 420</value>
-  </data>
-  <data name="SplitContainerDesigner.SplitterDistance" type="System.Int32, mscorlib">
-    <value>820</value>
-  </data>
-  <data name="SplitContainerDesigner.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="&gt;&gt;SplitContainerDesigner.Name" xml:space="preserve">
-    <value>SplitContainerDesigner</value>
-  </data>
-  <data name="&gt;&gt;SplitContainerDesigner.Type" xml:space="preserve">
-    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;SplitContainerDesigner.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;SplitContainerDesigner.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>368, 17</value>
-  </metadata>
-  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>206, 17</value>
-  </metadata>
-  <metadata name="TBDD_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
-  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1093, 17</value>
-  </metadata>
-  <data name="tslblAenderungen.Size" type="System.Drawing.Size, System.Drawing">
-    <value>152, 17</value>
-  </data>
-  <data name="tslblAenderungen.Text" xml:space="preserve">
-    <value>Noch keine Änderungen</value>
-  </data>
-  <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 566</value>
-  </data>
-  <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1199, 22</value>
-  </data>
-  <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
-    <value>20</value>
-  </data>
-  <data name="StatusStrip1.Text" xml:space="preserve">
-    <value>StatusStrip1</value>
-  </data>
-  <data name="&gt;&gt;StatusStrip1.Name" xml:space="preserve">
-    <value>StatusStrip1</value>
-  </data>
-  <data name="&gt;&gt;StatusStrip1.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;StatusStrip1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1141, 56</value>
-  </metadata>
-  <metadata name="GridControlContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="MenuItemAddColumn.Size" type="System.Drawing.Size, System.Drawing">
-    <value>169, 22</value>
-  </data>
-  <data name="MenuItemAddColumn.Text" xml:space="preserve">
-    <value>Spalte hinzufügen</value>
-  </data>
-  <data name="GridControlContextMenu.Size" type="System.Drawing.Size, System.Drawing">
-    <value>170, 26</value>
-  </data>
-  <data name="&gt;&gt;GridControlContextMenu.Name" xml:space="preserve">
-    <value>GridControlContextMenu</value>
-  </data>
-  <data name="&gt;&gt;GridControlContextMenu.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 588</value>
-  </data>
   <data name="bbtnItemFinishSQL.Caption" xml:space="preserve">
     <value>Button Abschluss  CheckSQL</value>
   </data>
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="bbtnItemFinishSQL.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAN4DAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -351,7 +201,7 @@
   </data>
   <data name="BarButtonItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -375,7 +225,7 @@
   </data>
   <data name="BarButtonItem2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -401,7 +251,7 @@
   </data>
   <data name="BarButtonItem3.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFYEAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -436,7 +286,7 @@
   </data>
   <data name="BarButtonItem4.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -461,382 +311,33 @@
   <data name="bbtnitLabel.Caption" xml:space="preserve">
     <value>Label</value>
   </data>
-  <data name="bbtnitLabel.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAMdEVYdFRpdGxlAExhYmVsO8It7eEAAAJ3SURBVDhP
-        Y/j//z9FGEPAKGsBg1H2QgYgYAJiFihm1IqbzqARN4VBI2oSg3rURLh6FM0grJc6B6zZLH9BiGXJqv+6
-        CdNf8soZcqpHTWBQC5/AoBrWy6AS3AVXj6IZhLUTZoAMYDHPX7zRonjlf720uf8V/BqiQIYqB3UxKPm3
-        Myj6tcHVo2gGC4AUeuWIm+Qt/m5WsPyPcfai/0p+7buA4mwKvi0Mcl5NDLIeDQj1yJrBAgwMzNqxE3O0
-        4qZcM8qYu904d8l/1dC+PyLGkeogw2VdahiknasQ6kGEalgfg0pID9BvPSAD2NRCeo/Ke9d2akd1xhtl
-        LfqvHTv9v6RdYRdQjlXKvpxB0q4U1QClwE6wv0A2KPuUasp7N/8XM0s05xCSETBIm/dWP3nufxmX6hes
-        vJJ8QDWMYpb5qAYoeDczyHo1gAxgATq/DRjKN4BsYSAW1I7qm68HNEDBt+2/oF50NEiNiEkmqgGybnXg
-        gAECTpWg7rtK/p1ADR3/FXza/uskzPqvkzjrv0bE5P9CRik7gWq4BPVTUQ2QdKwAaWZW9q5wlLAr/c+n
-        6m4B5POCMAuXoIRm9LSX2jEz/otbF/3llLLQBKlFMUDcthhkALuiT9McEZOMq0A2t5BRBoOQQSpYXDWg
-        fbpG1LT/Cl6t/3lVAiYAxThQDAACFnGjIHXV4L4PwkZJC4B8HiBmhGJ2aZvUAPWIKf9Vgif+F7MqesXC
-        q6iGbgCHtHPdfynHmv/CRhlAWwLDgWLMIAP4lN0lxa1K/4tZFv0XNS/6L2KS959L3u8TugEgxSBb+YEY
-        5Hc2IIa5AJSZQGKCQCwEpflQDCAf/2cAAGhHrgv9cdiDAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="bbtnitLabel.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAMdEVYdFRpdGxlAExhYmVsO8It7eEAAAg+SURBVFhH
-        xZZZUJTZFccvbrgA3TQ2S7MITdPddNPN0rIjKGERHESQHbvZZFcZFFRAxY1BVBTZBEccGY0z4+g4S1I1
-        lYekKpVKKpOahzwllVRSlaq8Zh7yEOaBqpP/uV/jmKaxKnnJrfrV15x7v/M/595z7ocgov8rXo0b4TF8
-        PPivh/TpKfI2EjuX+D0W2wS2gK1uNrPN2roorK3zwtI8JzE7p4X52AyYFqaGe8LYcEfE1YHaO1j+PwSA
-        IcUzBp6dzB7+jLKHPqOMc5+SvePBp7BzQD6WpjkR75oVJhZuZOG7wlh/RxghbKidFIbqWyL26E32pfj0
-        FHkbLAC2ZA29+GXepS9o/+UvKW/0K0ruWf5XZH5XMOZ4J3xMjci2npmE8KSIq5kUsW7h2MobYJx9KT49
-        Rd4Gxiabazwqe+jlat4oxBFELkjtf0bmxls9mOfj8JHCMlu3cOVNoa+cAONCf2RMRJePsS/Fp6fIRrBj
-        sCW1b/l09vAriH9OuReZLyjr3EvCmf8K875gU1z1bSmsR8b6ihsi5ohb+PB1seeda2LPoSvsT/HrKbQR
-        7Bhsyxj46Nf7RiB84XPad+EV7Rt5RTnA1r5EUQV9VqyRtRBTMQ7h9wALj7mFL4uoUnBwlP0pfj2FNgJj
-        s9V5Iy5j8PlqJgqPycFO5HAxDr+kvaeekKFq/D2sk7sQU35dyfjQNUUURBZfAhdFRNEI+1P8egptBMZW
-        R++js6l9zyipe+lve0988HXW2ReUff4FjuAFZQx8Qqj4v2LdTiCLMap0VESVjIrIEggXsfCwiCgYFuEH
-        zrM/xa+nkDcwePt90/qf/iax+xHFVY1PWZ23O9PPfEwcRNZZ7Mjgc0ponqfIooFSrN0GfGTGLFz4g7Bu
-        /1kRljfIPhXfb4gIi4svjxn0MPq3cUqY6u+ymYtvs7n6oint3Wdkcc1SROHpg1p7sc5xYnklc+A5ZZxh
-        PqHk3mWKLrv6FOt38DvhhUMivAAcOCd0eSw8IMJyz4jQnH72uz4ARRhA2IjbyoD+xeAAtiZ3LQ4r5zzx
-        na86XAXbLnv74k/S0ILp/R+DjygVAcZWTvxzV0RyCOZlMeqQrS53UISycHa/CMnuEyFZpzDlJQAjC0NU
-        6V9cGlUTbObt34Fsv0nseEjRh67yrccZbjfXTbQ7Tj4h3pk01EbqqR9T/LFZ0uX2Hed5fjd0H2fMosxJ
-        EZwJ0vnK8BKAFIaoHiATNsneN5QNxu89+ZRM9VMUkX+6ETau9K1qY05wYsf7KyzM8w6Q2P4I7Tjyc8z7
-        gc3BEGZRbWav0GZ0C21qF+jElJcAWFiPq1KPmyoGLYQhe9/eNncpuecxobVW/CIdfOXy9nKl77Q4732V
-        0vMhOXqfkAPPlO4PUQfXV1VxRWZ+F/ho07vF7rQuEQTh3Y4OEeTgDfISQAwLl6F/y67xn7L4wM6kzqVv
-        E1oWKKpw5Gf8t9vOwW03lF8+zlkndy9TStcyJXU9JnPtFAWnd11eWxu0txOi7SIopV1okluFJrEZZi8B
-        sHD0O1fRu/yuUnwxxX2WpM7HZKyapLCcE9w/u9juZrtfuD3c6pxb4TVJHR/II0hoeUBhuYN/wrzavc5H
-        k9wmhTX2JqGxNcHkJYA9fHEU4+JA/2LIDK3H7l5LQVamuqlVbeKRVNg0gLuACQRh5rrJn9rbHpL9+COy
-        ty2RrRXXcvEVUpnLCzEvizEQwoEQVtucQmXlMvISQGQRXxzymlzbfj9b68LveVuTsb221ofIbhEXzgOy
-        Ni+StWmBrK4FsrW8T3aI2loeyt9M3NE7tNvRxv/B+LMvdYJTqCGsiq8XKnM9TF4CiJCXxhD/lNsfld/j
-        4MxM9dO05+AViioaRR1cpIiCCxT+oxEKzx8irKfo0jGyNMzJwBKaEJzrAVmO3aeQzHf/sWmbH98JshhV
-        8XVCZaoVAaY61lgfAF+TfHFgyN431dy8noAsdQfOr+4IS4yHjbefz5Xh7WeCQFh06ZUvLY33yeJcgLhC
-        ZMElCjCWt2Ce64Z9+gQYqwTDY10AYbkD/JC9D/wtzpk/GGtQ0Rm93+BvFpX9755n+Ddn56/L7m0x185Q
-        PIIwN86TuWGeYituk8bm/BrzHKi8Gf0NlYLhsS6A0Gx5RXIAvhG5nekW133aU3KFgpKc/JnlLORXTpPU
-        gmpuRlHJdpLrd2hNkbHlt74318/jyOZQtHNkrpklbdqJ7301Jt49WYx++iNil76c31sfQHDGSX7I3jdU
-        jN2wHJunsH3nKMBQkg8bO/DR2Fsg7BKBCS6htqCwLLKieSfUUUWXfmGsniFT7SwZa2Yk4TgG/9gy7mvu
-        GrkLu6IP4eElAAw+J95mjan23l/isY3B6adWUEihbvsmKWxVhNXmBpheH5kqNLNnwFBxlzgIY/U0PtvT
-        pD98mwITmv+I+TDA3xBZC2BdAGzkTFTRxec7zfWzFA90+UN/h00H+G6XGaggrFIqmd9ZC1obkupyxh6Z
-        JMNRiB+9R4ZKBd2BC6QyVfI3WAvkUQAfzwDk1scdnfytiYup4T6Yp7iaaQrfP/xntbVuGPOvXw4wVuMh
-        A+D3/KNLxr6NOXzzO4MUnlKomEIhKkQWj5G/oep3WPv6KLwGEJLVT8GZIKOftOl9OIITKMLjFBBX9Qjz
-        rwOAMzx+CECDNYH2NtBCalsrwDOhmdTWJjcu2hFRzEIbBsDOZEsB7nfu791uuI24C+SLftxK+gr8/I8j
-        4DblLyXXC583w0e3BtvZ74ZHwGMtI66FN2FhtvM88+ZYC4LXcAJrcFBvwjb2JcWBouslgLex0fC29m3I
-        QUTi39m1K1TIHniJAAAAAElFTkSuQmCC
-</value>
-  </data>
   <data name="bbtnitTextBox.Caption" xml:space="preserve">
     <value>TextBox</value>
   </data>
-  <data name="bbtnitTextBox.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOUEAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
-        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
-        RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
-        aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iVGV4dEJveCI+DQogICAgPHBhdGggZD0iTTIz
-        LjMsMTUuNGMtMC41LTAuNC0xLjEtMC43LTEuOC0wLjhjMC42LTAuMiwxLjEtMC41LDEuNS0wLjljMC40
-        LTAuNCwwLjYtMC45LDAuNi0xLjQgICBjMC0wLjctMC4zLTEuMy0wLjktMS43Yy0wLjYtMC40LTEuNS0w
-        LjYtMi44LTAuNkgxNnY5LjlWMjBoNGMxLjIsMCwyLjItMC4yLDIuOS0wLjhDMjMuNywxOC42LDI0LDE4
-        LDI0LDE3ICAgQzI0LDE2LjQsMjMuOCwxNS45LDIzLjMsMTUuNHogTTE4LjQsMTEuN2gwLjljMS4xLDAs
-        MS43LDAuNCwxLjcsMS4xYzAsMC40LTAuMSwwLjctMC40LDAuOUMyMC40LDEzLjksMjAsMTQsMTkuNSwx
-        NGgtMS4xVjExLjd6ICAgIE0yMSwxNy44Yy0wLjMsMC4yLTAuOCwwLjQtMS4zLDAuNGgtMS4zdi0yLjZo
-        MS4zYzAuNSwwLDAuOSwwLjEsMS4zLDAuM2MwLjMsMC4yLDAuNSwwLjYsMC41LDAuOUMyMS41LDE3LjMs
-        MjEuNCwxNy42LDIxLDE3Ljh6ICAgIE05LjQsMTBMNi4xLDIwaDIuMmwwLjYtMi4zaDMuMmwwLjYsMi4z
-        SDE1bC0zLjItMTBIOS40eiBNOS40LDE2bDEtMy4zYzAuMS0wLjMsMC4xLTAuNiwwLjEtMC45aDAuMWMw
-        LDAuMywwLjEsMC42LDAuMSwwLjlsMSwzLjMgICBIOS40eiBNMjcsMEgzQzIuNSwwLDIsMC41LDIsMXYy
-        OGMwLDAuNSwwLjUsMSwxLDFoMjRjMC41LDAsMS0wLjUsMS0xVjFDMjgsMC41LDI3LjUsMCwyNywweiBN
-        MjYsMjhINFYyaDIyVjI4eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
-</value>
-  </data>
   <data name="bbtnitLU.Caption" xml:space="preserve">
     <value>LookupControl</value>
   </data>
-  <data name="bbtnitLU.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAENvbWJvQm94O5zhLCAAAAIcSURB
-        VDhPjZNtT1JxGMaJVNTqE/mmLVuba+trtJogKhMrNQo5wnZ0U1AMtQddL/IhBXOmCCbqdPM7sPXCMOVR
-        CJAXV/d9czhmvvFsv133n3H//tu1cwz03CKMxG2NuhvCO7xrMHo/7UXHZ/fhm9uHl5LOGKvxcQ+WyYNr
-        WAMHadrlCw11vFQoVZBnitfp8B/i6KRwhSev1kG79SyoH/2wi/yfCtL5CyHDeV6d0/kyHveuIfwzizb7
-        Ktp6vomAk3YbWNAwMrODHAvOy0hp6HOujEe2VaiROFo7g2jtCmLuKIGHNOsCNbAtgtpC8j8eWFegbMSh
-        fI/DRbw/PMZ981cWmFhgcvsjGGImtqCMM2G4fJsY9Ibh9G6i5fkiWp4tUTI8V8+6QPGFkS1UcJYtCacZ
-        ykxZy+r5NF3Cb4bmDPXTr0oHjSxodI5uSGHDMzEMT+8SnDGoU5w7kuoUZSCGXiWEdO4CL9whFjSJwDGy
-        Lq3LDcRJLVNFgrOEhDZzpkhgV1Z0QVOfuiate979gGdyW8ftZ6LCEDMRRffbZSnW5pQSm1nQ/NITEmsi
-        WcKvZPGSs3+SONbgnrreSIlVQY8SFKvLFyG2qH2iloSTc4wJwzKwIAV3vF5gwR0R2AaXyVqWxqtJ1M5X
-        uPzNPDCvC0ztfZ+jnY4lMFbHIqxk5xssDP1R6J+HmWiX/IKn9tko77KAP0se2Hb3BtzTkt4Bg/EvuFp6
-        6EAvx2cAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="bbtnitLU.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAENvbWJvQm94O5zhLCAAAAW4SURB
-        VFhHvZfpT5RXFMZta913u/wnrZqmpkts0jYmTZr+A22qtlgVFRdEZRdEBFSQUbBa6wq4sKjAgIJSEfvJ
-        pqlatCKCMs7AsMyG5vQ85y7zDjBfGtOb/HzOuaPnee77ju/MTBqzXovD668QM3PcwouTmTeZKWOY+grB
-        fBPELjSTXafamw+d7qAot6y6UJ9ijcOWY7/TZmbT0duUdOQ2bSzvoA1lHZRYdovWHW6nta6btKb0JiUc
-        uH6VvRAiJgASTcGgyOhLGmUiL1iZyOgLrhm9JxpR+2EH36Q10IOhMD0YDFMnc38wxATpvl9xbyBId5mv
-        Ui4Te03TnnahmVp6sp2HvZSBYqTrcAS9UnkdyoQc+vXOevqrP0jux35q7PJTQ9cA1T9SXPlngC4/7Kc7
-        ngAtT76EANO1p11oppWcuBk1EMOXDhNVG4xxKKzAyTp6hqi200c1f/uomrl430cX7nmF83e9dIPDfbG5
-        FgFmaE+70EwvPv6bMncaaIJQMRsVgqhlT9XLt9ZR9Z/PydXWRUu+O06LvwW/ii5iilsfUdUdD322scYE
-        eAPGZkmA/b+0aZOoIYZbQsoMBAD3AQ4A/XxTLR3reEp57i6q/UMZgWUbaqiGjXPdj6i8vZc+TaxGgJnM
-        uAAzin6+wSYwwOCxxjDSppoRQ3CUlq2vFoPtNZ2UfukhnbrdS58kXhRFj31X2xP6aM35CQOgmVF4pDXG
-        QODhAEbWVPoIDQcNo/TxugtiACMT4mRH1BwUt3bThwnnEGCW9rQLzcy9ZS1quAMMH9sPB7Qx6xBqZunq
-        c2JgzEwIZ1907TEtWVUVP0DeoWv6RMZAm7HCKIaRaD3IfPBjlRg4DceS39RFi1ZWIMBs7WkXmll5rmba
-        XdpMuZYm0ZyDrEzOQVXnlDTRrhI3A22ibK6XrKoUFoOVlbRoRSW9z4h+X8H1WXqP9cv18h6YOEBu6VU5
-        zVAgTIN8Qj8DHRxWoPcPhxmoqgcsERoYYpx7/GQU+MnYD4ZClF5UjwBzGHzu2IUAs3EyMdbDDRiGvRgD
-        M5zpd2LM+FHss7Xu/WFKLZBH8VxmfICs4kZlisETGZlhqKUPSQ8jY+YT4xB5Te1XQaBeZke+PIonDDAn
-        Y1+DDDZm+462URHg54Oh0HDkOnODCqDlCtQFrHvLWxnWslZ5v3gHQvRcB0jJq0OAeUxMADRzcH98fJ/M
-        5VOplSqiJzHIYBgYsCd1kDyOfY/0QUreLY/iCQPMTS24EjXgEDhBDIdbaQ/gOt/Uh1toz6EWygMucE3T
-        QrtZM/c3koc/Jfs0W3LkUTxfe9qFZh7uj5zAnsKkj57C9BbH8L7+kCa698zgU2zOvhg/AO6PunTq8uFU
-        OIVQqsgVrvJzgWHNYcXzYRerpQTwHrOzoJ6NA/TUy3CApEx5Dixg8K3ILgSYn5xba5N7zEn4HwmO2pzm
-        mdfUAamfSg8z1DDUxtz3soINGfJZsJAZHwD3x14u1l3FzZTN4CRQRRNlHTC4bZ3JdeZ+N2UwUKn3uSkl
-        /7I1730eoMS0+AEW4P7AHJcqegJ1Mie9ghpoa933YM8B+h7+KqbqEUpMrUSAt5iYAGgWJmWd1wNVAJwG
-        p1A0iqYXNQppog2UXoi6Qfq0Qlb0og2UymzNraMnHOCJZ0RYu0M+jEwA+81YAuD+ONNHGVEn0yeB4lTq
-        dPyaNkA9Vnv6UOsAXP+0/SwCvK09YwOsT6+yZubS4bKJykC1j4HKJKoYLia674Zij0HdDY0TAH+gWbAu
-        tUpMZAgbOwfGaB8MtQkjw6G6FlOHduPv6np1yhnnm9AGkA+jH7aeaF67s0Lu0xrhrNLtFZI8hhSlq1mF
-        beCMGCRAGWjCttOKZKUrko7ilxE+juFpbwG+lOI3IL4oIB0u0Tv/kXfjgNfw5oM5vGJ+FyAJNpAKl8b5
-        w/RVgtn4Lw8ve3rnwub/gV6TJv0L5l1tL35cjlcAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="bbtnitTable.Caption" xml:space="preserve">
     <value>Tabelle</value>
   </data>
-  <data name="bbtnitTable.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAFRhYmxlO0dyaWQ7U3ByZWFkc2hl
-        ZXQ7Um93O8al9FAAAAJwSURBVDhPpZPrS9NhFMef7EVB9Vd1oSiiArMsTTKw2YUKsTZnTrbUtbuaMsnK
-        ytKwoi2dbrqtoe7mFgqGFr3zMi+7Z24z+Haepxn6QnrR4MM553ue8/1xDowB+C/4bxdR8A9270ABu2QK
-        OEtMAVwwBFCs9+Gc1osizTgK1WM40zSK0w2jOKXy4KTSgxP1bhxXuHGszoWjtU4ckQ+7WCkND31PYehr
-        EjZiYDaJ+30zsM4kYPmSwAfi/XQc1d3T6JuKo3cqht7JKHqIwzVOsIvGAAa/JaH3RKDzLEL7aRGX20LQ
-        uBagdi6gaWQejcPzKDb40eCYg4pQ2ufQHeYGI2C80U9f5sM6GuYGZWSgFgY0nDc4r/dDRYN8WDk0hxeh
-        VRySDZMB7a14O4sr5jDK20NiuKw1hNKWIEqa6TZGP33dRwY+FOl8OKv1oVDjxfXOSRyUOsAUJg/WMr8Q
-        T2URT+co5tDR8xkxymOkCSg3vw7/raNEam0DMq0LTK53I/1zI9/MIZrMov1VWEQB6atE28uQqFfzepIM
-        7qppBenDEaTIgDdEM5HFo+cTlGewwjWqud7aFRA511YSGSTSWVQ9sINVNzrEQAs9aOkKitgsCML0LADT
-        0038MHKe+GEgeH5bOQh2R2VH4kcOy/EMlsl5iaKh0/+n5sTWRdR3+qi3Lvo88jVuKmxgt+ptdLwsluhh
-        JEZNQvfYu62OUK7pGBd1JMr1dbHWtdp+sBt1A9uuy5219JgfbvNoHI15TOy+FUmNFazi3jtnpfwjJHIr
-        Kkng4tU8EhnFrUgtqJBaCR4tKK9646I/FNtD7CP278CBHaAe2/sbNQbMTHpxA20AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="bbtnitTable.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAFRhYmxlO0dyaWQ7U3ByZWFkc2hl
-        ZXQ7Um93O8al9FAAAAWpSURBVFhHxZfZc1RFFMYjyL5v7n+N+qqviiKg5YIsISyTTAIVQUSDSFkWhCSz
-        L4lIoojKVgKikGQmkwVKHqzSQkGTkJBMMmHJinX8vtO379xQPqBV4lT9OKfP6e7v687k3lAgIv8r934e
-        ekBM+tjiFDDV4eF/wbT7hHOp5RqZsjnY+LQ/0Z7xJzvES0mi3RBvl2Lgi7UpW6OkVbZEQLhVNoczsikE
-        ghkpCraAtBQF0rKxxlBYnVI2VKVkfWVj6+t7Tz4LXR5UTUwtTXb0HLvcK+nfbxr+ANcMDZkuSSEq6Hnz
-        +nQn8iFpVm460fBZc6c0ISpX8zRkOmV1xZke6PI21MC00tqLukGy7bokSGsPMPm2uh81j3vqcYey2ktu
-        TmIkY2Jp8qLEmQPtab1bLvw2JKv3fMdv3wzAH0XBdBpohDt3E7sAUMTmJJrpdilNXJJoC3PUGVucPqI/
-        3iERjlGPePj+Sk5W7TlLAzOtgRk0cP7XnLPAbMKcC0oTFzWGHexG4XS3imgdeQgwhtNdyLukJNautVAK
-        4xT7pn72l0HcgBqY5Rrww8A5ONNN7GQuRKRIUHNu1o08T0m0XWOguUsCmBNoRs4IiiNtpg5qlE6paeqS
-        0z8P2huYDfhFLJjJG0j+cBWu8c0nUYJvPyi2RDAG3NjiI2HkSqv4Qq0mgq3IffjNIMwNGQmdviKrKtTA
-        HGtg1gcHzsjY+J+SuzUmgw65m4zjEjmUlkHmFtQGnDlh9Aa8PQ+hT03PZYj1URkZuys7Pz5FA3Otgdm7
-        95+WMTTsYt0UAoxWRGsOmmPDkO0hVyBg8lEYSLnrbC0LRsYmZMe+kzQwzxqYs+uTb2UUBiZvZvAaYD1r
-        e4jBOiOShTA3z3rmsMeo89FzDYxOSPneE5MNvIsr4dVYcU7UjZHzJNxYBdj35F4Rg2MEBOqaJZsblX6O
-        c6bfj/Gd0buy/cPjNDAf8LFcMHfHPmPAbqxgkTklNtJxfnM7L1DLHnL2VMyIcG2gtilfpwHtw8DIhJRV
-        HKOBBdbAvPKPTsjxcz/piQzNEqxN6SkCGBuQQ9BSA4GaJCPwxiTqbr9Jqh20Do6euiz+97+mgYXWwHxe
-        CZ0Z93Sch5t5xy6D6EGwz8kZ+zSOaF6daDI1W3fm3B6ekOLdX9HAImtgQVnFN64BO1FzQNd2EyvEyD5P
-        ZjaHqGLmMa+iAeQ3nNoNZ86t4XHx7fqSBhYDvpAKFvJK6EyFHDELRczifI1jQhEK2LGXqnhjfjxgYh8i
-        DWzZeYQGllgDi0reO6oNPQUmeYWqE42TRA0YY54r4gj02hwcRK/XyS0cD90el007vqCBpdbA4q24klt3
-        xs1EFc8vqoIBUzcb3Bgw4uRg/ILWrFBvNp9XxowBF/ZADk/SovLPaWCZNbBkM66k/tglPZGFJyD5/IIb
-        K2PIieaNOr6XA1Enchw9rxwAdUfapHB7PQ08Yg0s5ZXwalynnpg/5bD0ZIHm7A9D4DxqI6g5PU9eCQNu
-        zQPfB+u3HaaBR8F0Gli2sbxBr8Y7kQIU5SnyG5lIc8x5SkbONT3QT0ZkP05r53PMeB1jPknXlamBx1wD
-        hdsb9CXjLrAbIRoRs0Ee23NEKID5FOD4OvL9EWsgD+t8gq4tPUQDj7sGNmyrV2e6uW5mhLihPaUKWBFE
-        PSVEWNO5WjN9NRBGz7vO6fOxvMavBtwbWLzWf2gw1XHNPNf1lYroPO/j9RkZcJ7lAw76nkCMHm5xxubB
-        5IVvUYrdW29quypv+Gpz0HV/Dec+t/ydFa8VxfpeLYrL6o0xl1WFJCorN5CIvLLeYV1YVoCX15KQ8tLb
-        QZfla0hAefEtLzXywptV/c8871sJXfd1zOcx/zqhI17LE/fBk/+ApzxwzF8/ivP0+v8C/kMnLPBnwr/X
-        /yu4P6EeddUAP3bwIDGfv/sv84NDCv4CUNpuTu8bCaEAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="bbtnitDatePicker.Caption" xml:space="preserve">
     <value>Datepicker</value>
   </data>
-  <data name="bbtnitDatePicker.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAERhdGU7Q2FsZW5kYXI73zjYpgAA
-        AqNJREFUOE91kolLVFEUh6ey3G37U0LSEKkQqWyIKI02yxomralEsDQ1SyoTsww1hKjQTHMhXCaXisol
-        IygSN8gc2xxNZ9PRefNm3tivc27jEtTAxz3n3fP73ntzn4p+ywgfYtUSfP+DnxeuVxKcVfl0xKrb38Sq
-        0bknBu27d+DVrm14qY7G85gotG3fipbozdBHRaJpSwTqIzfhSUQ4HoeFdlCWb6by7Y5Tw1Z1B7bKElgq
-        imApL4TlwS2Y7uZjsvQ6JkuuYvx2DsYLsmHMy4IxNx114aGgrD8L/Lpid8JKwbFLOoxePInRjER8T9Pi
-        W+pxfE1JwMjZeBh0hzCcdABD2n0wpGhQGyYEAULAj26+X4Afmd7gOY0Ifkk+ghHdYQoexGftfgxp4vDp
-        2F4Mn05AzcYNLAhkgX/xo4+Ym/sFyemBJBNOBQ6qZyXlbxwKnC6PoLD8PQuCWBBQWPYBHhI4JA79Cc4w
-        FLAL3JieVQg3zbBcQf69dywIZkHgDWoUz5wI1D0bRF3boAjU0lrTOiCC1c0DqHraL2R2yY1rpd2LgtzS
-        t3CTwE6DtRTg0NSMS4Sqm/ths7tEuFLfR9fdmKK5y0VdLAhhQVBOcSdcigc22rTZ3bBSgLFMy4QLZmZK
-        homwePcyb75mwWoWBGdRI7s9sNKgQUdHdioeJqormvpQ0diLSZuMh7QyXJtIfD7vBQvWsCAkjRr+Z820
-        YaBjY8FCqKEXEzYnyhp6UFbfg59WJyasMlKutC0KuHHICg3KYpOH5hlfisWJMbMk1jPZLSxYKwTczNLR
-        iABtLiJhjDBSbaSgkXteiaQM/YIgQJNa05GUqaeLTUhkLszTiMR0WtMbcYJJYxqgJY4mV3ZSVnyJy1lC
-        8PuwcZ51/2C9F67pK1St+A0xSHi5PIEXmAAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="bbtnitDatePicker.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAUdEVYdFRpdGxlAERhdGU7Q2FsZW5kYXI73zjYpgAA
-        BwpJREFUWEedlllQVEcUhjHRqChxq0rykLckmpQPeUmVeXAX92j5koeogEuiKUXRQkMQWUKpKKCAohGC
-        uOCCqCwO+86wKkpMqixFZKnEBVBBGGCY0crJ+U/fOzOMQ1LJrfrqdN/bff6/7/TtM258jYpNqiiPS66i
-        uNOKo8mVQtxpLeKZgLZrYh1i7CmH+9w+klhWwTrvMG9BkIhs4Bodx4PMltc0AMxvcvO3P+39waHPwI07
-        f7xxz5GYJCOU3Jm3IehsYEzMKaMM7O610stei8JkoW6T6l/MbOBn3Lc9t0ob99C+kHHb1h9Cj1XyHvml
-        AkrjGJcGxmIABurJEVUSJXQhEwJ6X39m53x6PYs5PGdhFS2c9xVFJ5RDaTzj0oB7dEKZegM8oUsSqcld
-        NoFbmoD+jAUE1U+5Vq/mYY4TfWwg8mQplDwYlwbGRfGAmtttIqSTonHu2i26fXw51ccvo/pjS+lG3GKq
-        i1lItYcXUE3UPKqOnEtVB2fT2as36cwVZ25Q+Y0WOnS8BErvMq4NHDpRQv3s1Nm98NJC5eEzyPokl8km
-        62MDc52sjzLJImRQUeAX9KJnkLHQCx6POV0vuc/09VvpQHyxbmAkBJ0NjI/gAX0DrySBLozJelIIDDQe
-        I1PdJjLVatR8x3xL/XejKWfH5yIs4xFF3ELPGRMb2He0EEoTGJcGPDCgr5/fgOYadEkyBQQGfo+gnsqN
-        1FO1gXqM67nNGNeRqSGUMjZP18Yq8ecO9HLe8NgCKE1kXBsIj82XV4UJKgm777YnhICpfg8TSL03f2QC
-        qLduN+NPvbX+lOYzTRvPohxtiAErhR3J+0cD72JAaU0TJafW0SmdSyomXaoVgcs+U+my91RK9WLWMmum
-        0qXVn9DFbz4WEi/UUAI4j1htI6/sHoVE50BpEiMGnK8JwTwATvXX9ozdA72deLHGdu9Zt9khmmWlEHK8
-        ZxvTNUg9fVbae8gAA1MYHMcjIOp4TdgbmS0GbCI80ZaEY+J5CJj5S3ktmxVgc8WeTCO/wFgKjUjiPjac
-        jlUDB5GVwqPOybhNfvuqWA/1QEfMTNxz0EC97FQX7oR4l25gkE6mVEm/b8BK9YG7qGTlIipesYi+94+k
-        6oYHtGq1PxV95UnFyz2paPkCoXCZomDZ/CHj8pfMY+ZS3uJ5pZoJt0kBB7L47LdSJxvoZCEBRrT2z+eq
-        JPbyiopXLKSOmDBqjwmlhI1byPQXUeiSVdR+OEQRHUxPo0PsRAUPGfc0MoieMLkL5+BnkYNp0u59GWQo
-        vitCJ4RKxVnAfY7xZ4xU19DKq/NkkRBq899A0V97UfzZPPKdMYfadq4XWneuo7Yd66h1hw/D0c9nyLjW
-        7d70OCKQcjxnw4Bsysn+4elS/TpemKmDVyqR6dT68Wcqqf3FAG+oQSpYOl9WgeRBs2bTyo8+o/XTp4sQ
-        koMWh9iyzZsCv5wp47ynfUotvmvp0f4Ayl4wCwZGwcCUnWHXpKh0sEh718AbRuKTjfT0ORswDcpv+Dhi
-        jy25XchL4etFzcJaat6qs8Yet7CB8F1kmD/TbsAv9KpUvnYWw0rFiLQVR5Mr2EA/l2kzoXBhw+K4tlVP
-        LdraUjEdohM9fRZC/WFtfJZuk7cHp/FgPn4FTNSjmpB6/Vf+3s38BswyEd92aV0rlYDaNhlTUttKxdwu
-        5og+YhGoaZF+UXULt1upkONLNhBxXArUaBjw2ByQUua79zJt1UDbN0hFuReUKmQV3CEUrh7+YiCggyNY
-        iWmCfIQXau1CMTAowgXVzVRQxQZ4/v5jRTAwBgbwGvBnASfVe06878AHzIcoXEiA5Dq6QCELFLIAakgB
-        BKsg2CwG8ysfMs0C/nGFx0mFFAM4DPA9YkPAzHBgsBQufDHDFS57Xx3lapzW5vsAGz4sRgrUWEYuHIn/
-        BkyOQeFCgnxemb4iJMcXIV/FNh8RyTM+pFxjE+VWPJR+TgXaTZRT3iTzQw7nwoD7kNI4HNqFNzUGhQsJ
-        RIBfKyKOazHg682fn7f0ISiwII73bI7Z5Q8EbErUH843zqWgM9oFA2MxEV8HVoPV6QItW/kMYJoZESxr
-        IgOLGcoeiKHrpdwubaTrZY3yxydQVcjxLgWd0S4YcEfhwqYbrnChZkifUbVEqy8Yq93DnkD94XweLgWd
-        0S55A5iIjWbglSgeyH9BrDALKyxpFIEsjlkl9ykT/W4LR24XK/D8h/2Z/+sNjEbhwioglFV6X4TQhxDa
-        EJC+JpbB4FjPKFLtjKJ70kf94Xz/aRPKl4CJSOC4ItQLldwumM5C6ehDkJ+nF6KvQH/nT9eQeKRLQWcc
-        rhEoXKpIuS5cAPVjaBu1RUfdR/1BPpeCzjhePDHPL/QKJwBXyS/kCm1n/EKuSrSTpuFwj2uOjZC0PDc3
-        N7e/AQoaPmZd4jDGAAAAAElFTkSuQmCC
-</value>
-  </data>
   <data name="bbtnitCheckBox.Caption" xml:space="preserve">
     <value>CheckBox</value>
   </data>
-  <data name="bbtnitCheckBox.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0
-        bGUAVGFzaztDaGVjaztd9Mx/AAAA20lEQVQ4T2P4//8/g2/TDnIwI4gGG9DS0vKfWAwCZ++8/l8678R/
-        oAFCcAOIBSDNwW27QJpB+DhJBiBrDmoF054YBvz99w/KQgXoms/cfg1iI8IABJ6/+/o/Y+rh/5cevAXz
-        YQCbZhBAMeDn7z//UycfBCsKad8NNwSXZpAeDBccvfbifyDEb2BDVh6+i6IZZBgMYDUABI5dRxgCw+ia
-        QQCnASCAbAiIhjkbGeA1AARAhoR27P5/6tYrqAgqIGgACHz4+hPKwgREGYAPUMUAIEAYQA6GG0A+/s8A
-        AMvnIBD6K3W0AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="bbtnitCheckBox.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABF0RVh0VGl0
-        bGUAVGFzaztDaGVjaztd9Mx/AAABb0lEQVRYR82UwUoDMRRFq1/gj6n1T0TBD5D0KxRcu3aj7gStbQU3
-        QrVLN6IuBUWtTnw35IXJzMtMaNPYC4d27oQ5ty20o7X+V8QyJ2KZE7HMiVjmRCyZ9f3TlKyWr9nhCRml
-        lE4BZzh51SS9ItaiB6QK5Fu9cwwANzyCbhk8MZNqQEXO4JtYodvGVZODFAMC8i9ik3AuT8zMO6BNDuiY
-        wRMzoQGFfW2KJLfXTg7oqMETM9KAk9Gj7h3f6unPr23qCckHDy947+SAjhs8MVMdAPmGfaAKjGiSI5CW
-        ocrgiZnygIu7JydnqiPa5DazDXj/nOqdw2vv4YBHxMjxPOpnG4CERuwdDWI++fwDkNCIMpIcSTIAaRoB
-        +XBSlyPJBiAYsX3Q9+Rddab798/2RD1JByBvH99uBOSX47AcST4AwYhd+jna5MhCBiBFEfPnvMABsVmK
-        ARTRJZZLMSA1VQcjljkRy5yIZU7EMidimQ/d+QOFjkRKvckI+AAAAABJRU5ErkJggg==
-</value>
-  </data>
   <data name="bbtnitButton.Caption" xml:space="preserve">
     <value>Button</value>
   </data>
-  <data name="bbtnitButton.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAB90RVh0VGl0
-        bGUAR3JvdXA7Qm94O0dyb3VwaW5nO0hpZXJhcujTa/cAAAHgSURBVDhPpZNZaxNRGIZjam0S1/8kgopb
-        br2WgCCUYut2Fyi0TSoq/gAVibYxexNKm5hF640lMU62ZnEjxEDT7DHGLLw938xk0pQKKX3hgeHMeb85
-        Mw8jA3AkDlw8DJRjDPk+xv4D3aP9gyxYOJ/eFoHOGt0DhwVLRGLezGHOxGF2KeRnFRo0CG341urxZP72
-        kG72kGp2kfzTRaLRRbzeQbTWBldpQ7PoozOPC00xs8thvmBPVWHdqsCcqMAUL8EYLWEpWsRbrgjD1x2s
-        /ajhpnadBpwQmmIevdxErNaBN9uA51cD7p91fvPq9ypcmSpW0lXYkxU2vIwb9500YEJoitHo37vVD11Q
-        P3Di+j0nrs04cHXagSt3CTsuT9lxacqGi5NWXLhj9LDK8CuwHGfQsRSMk4wzImcZ5/ZB6yqGkkEdsiJl
-        fO5d6MOoRrSGzxusM/Q6CtpAJvoWtiQLHd7Cl/I/BIstbBZafSN0YilKMpJodPD8Ux7PNn7j6cc8ngRy
-        eOzPYdGfhd6Xg86b5e2IRk4LVSEqMhJmT7EkyzDHyzDGSlgmlZEdprKA1+ECXoW28SK43TcyNGDi1vya
-        b1Qj52+/CbAOfUwp9EXJxCkGTSb6RvaaIeiayvID/7DRgWwXy2II2IRDjzwAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="bbtnitButton.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAB90RVh0VGl0
-        bGUAR3JvdXA7Qm94O0dyb3VwaW5nO0hpZXJhcujTa/cAAAYJSURBVFhHxZaJU1VlGMZVIvetfe9P6E9w
-        UlPLnGbKUjHNrMZSS9NxyQ1xQVBRQRYlAhTZRPZ9VZFFZL+ALKbIflkuyOYSNW/P891z6Eqn5jbj2Dvz
-        m+9wzznP837fd773ZZyI/K8Y/vg0MYrxT4jRMDLWUeGXXseBL00ADhrPjMHRgGcN4O98fzQJI2MdPSZ4
-        xpXP9U2ru+GXWi++wCelDtSKN0m6KV7AMxEk1Mip+Go5GVctHrFV4hFjAlVyPNokx4BbZFnJHv/sBdBk
-        0ioJI2MdBh9y8EqqNVe0D0rrgz8ULRrNw+R3aRoekUYyNCJ3wG0yOCK3QMPAiNSDuv7f5NqdPjkUWtIJ
-        zYmAK2porMNgAo4nMKMaCnTcl1zSfl+ualxpI8NyGeS02tAyLNktQ5LdPCRZIBOUdD+UfcHFVJ4KuBWG
-        xjoMZjnRNbxMSi0P5bIShyiFQRaheNOQZDQNWrk7KOkaaY2DkqoYkJQ7A5KH5Lf55VN5OrA7gUl7Aosw
-        62GI9GviAxAfUMKpEKY47yXf7pck8mu/JJJb/ZIA4hvuSXRtn6TdHpANHleoPAPwOzA01mEwgck7/Qsl
-        E6bhpm6JMFkkqsYil272Smxd3yhx9RytRlG4F1XTK+FVFgkp75ag0i4JLO6UGDy3zj2byjOBXQlwmaZu
-        9cmTVMzsPMTOl3fJuTIrwRAmQSWkU34hxWYJgJkab3TKzwqz+F83q8TXHs6g8mxgdwLTNnnmSgKWkSaB
-        Y4xoEAADjv5FVqOz4Awp7BA/cr1DfAs6JLSyR75wSafyc4A1wdBYh8EEpq8/fkVisKyckTIBNLEaaSYw
-        8MVII9/8DvEB3rj2ziPt4gWCkfjKvSlUfh6oWmBkrMNQW/CNa0aHT04jvoEeCccswjByNiEVPXJBbUuP
-        nC/rxrZ0Y0s61ZYEcluKrWNAEUDybokNsmxnghmas4BdCahj+MnmwE/XuKR1fXkgA0tI0mX1/jRZ5Zwm
-        n4OV+9LECTNz2pMiK3aTZFn+U5Is35UsyzB+tjNRsXRbXPe81SedoDlF0x4tyf8UqhKCSYBHhx8Pl0/n
-        BRteGsPLNryijXxnGmBfoC6TsIV+f0uKP/Aml4zYNhxCMZZWJsmZscrp0GwsfIbPTtZG22vq0IN+j4We
-        mREOB0Ly57vHmIqPxVbLUeAeXSVuaD5HyMVKOQwOkcgKORhRLgfCy8UlrEz2h5aKc2iZOIeUyN6QUtkd
-        dL10o0fCImhyYuMNPwwdLZiAo2uUyVzQeE9u3XukaNCo73skteBm7yOpsVip6nkoJlCJvlAByrseSmnn
-        AynpvC/J1V2y3b+AzYqr5GBorKMFl2qiC2ZUiDofWd0rEVWogCZrFeQYprBIWKVFnZxQbbxQYQEcracp
-        BCcpC71kk7fqFfze7E5g8o6AItX1HhME1srJ49kjwdoxPVfKowpwHYQxEOjHNqmhX75yz6E4P3ZHQ2Md
-        LVSd2OiVK/HoAzzrwTz/mqC1crIPoA6gaipU5dRLNChCcUNB8ytoV3VmBY41NHla7E5g+jp0uItY8uM5
-        LeJxuU08c9vlNCqgqoyoiKySLMtnCq1G3vm4D05da8PzrXI0u0Xcs5pVX1mK2gHNF4FdCfDIzFjrli1h
-        WPKjWS0Qa8b4FxTWcVM0qdE9E2Mm/lY0yZGMJqyMWT7ankBx1oxnDY11tGACs1YdzEAp7hoVtzU6ohnQ
-        iCY6rrbgvmvGXTlb2C6Lf4yj+KvA7gRmL0cpDsL+jjXRjQ6TdG2EkWv6Xfz9OIeAD7Zk4ffR/zmBmR/v
-        iDe7JjRgBuiQaq/b5Qz2mvvth7321fAB3nlt4g2j0zq5+Gau8rtplV0R1TL320jWAZZyu74BHsMpc1af
-        cFqyJaZ7ydZ4WbwFYBk/2Bwr72+KlUVg4Q+xsgAzW7AxWt7bEC3zN1ySed9Fybz1l2AYJe+uu6iY83V4
-        zzsfOq+Bpt11gJWQq8Aaz6PDpvOaxus2vKHxpsZbNrytwWsuPf9dY3+xqxQzVD8Ato1pLHrT+Tf4HN/n
-        hKx9xshYZ0xYX3hyWMPI+Okh4/4ErbGwbB+fWvQAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="bbtnitLine.Caption" xml:space="preserve">
     <value>Linie</value>
   </data>
-  <data name="bbtnitLine.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAExpbmU7zNkjfQAAAeFJREFUOE+N
-        ks1O21AQhQdREEmkvkzDX5zEIaFxCE3s/IekQTFQYsnEVSp+0lbdVAXRInXVRVeFvkRfoX2BSiCxYuNV
-        1UeYzlzb1wmbMtLnc+b46liyLtDMEI+IOR/2M4gID4Fn7s35d3x9doXj00s8+fCN0/la9whqz+9zDJzX
-        /T0oWBi9/Yo3d3/xmhiOv3AaqWy9AoNgFb4d7uxZg4Lo/ugz/vrt4o+ft7g7vOA0Vmq+hLLAEVpqeHgZ
-        0XBkQaTaHWOlc4z61hGW24e4vmk6mzUbJNUJL7MDWTBLRInHzJq2PdL0fbdgDKyCYUFBZwahcmawDrwC
-        fuSf7cHTEhGqTeqSWpzlJ98FnpAF2WIfshvmPfp2rmi6uWLfyhZNyG3wmWlkgar1IJPvgUpkyAvlXevZ
-        5P8QVvAuOKdq22FBKtcRJNdJiSTvodqkLuvUGUIWKGtNogUJQskQ7AP1sAl3Va0P6UdP3VhRsJKuw4ra
-        8HWCtJ8Ri4rh7I0ucNf5hDvDj2genNPnYV4ULCWrRCUkxbsPe4JmofvivbyxrZ13XBARBXHFgMWER1zR
-        IZ7QyZMK7+U00Ur3RN7YcuuQC2Ki4Mlq+b/w15bVDi6n27iUahFNLoiKgodAM3VjiRgAzP4DCe5axIRY
-        3gMAAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="bbtnitLine.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAExpbmU7zNkjfQAABVZJREFUWEfF
-        V1tPXFUUPtU2BfV1v2hifPXBmFgplwJzgRlmmEvpwEBhyswAw1yZO7dWQShIuVhovf8D330z0acmmhqb
-        U47EJl7q5Y9s19qXs/ccwSdNJ/n41lrft9Ze2Sc5ORiU0mcK/scwzgHOAy5owPxcdLJuRCcbRoRxnXFk
-        qmFEAbLG61Czcx4zr6gpr9QaLQuc37n/BXUCFwlP1IwIAzbJmOdhrAnmkPWaEYZDpM4BNaHLWF/g4mx5
-        h35vPaUPrd/ow+NfabqwjcLF8HjFCI9jA7IANIdwCNZtncch4UFWHvALME149QXaprOb9DvzF/rlN4/o
-        19+e0KnZNRTaQ/GKMcxQNkIAyRKooUfFUlM13qNmSOgLtE+kb9EHP/xMv3pgAY7pWHKFhmIzr0av143g
-        2AIAhjFujZFVXBYa8KjSeF35ZNxyA+6hFHX5U7Tfh0gyNNc/Oq7evEfC41UjMFpiCMYEMHaA6YL12K5B
-        H8tFv77Ac3gLgBcRb1zyvha8VjiprB7Sldufm5XVIxKGKwxcK8IQARk7axIteaHVI9heIDAChpE84yEw
-        c+RJaGzBqq4c0eWNz8zyyiEJxUtcEz7mhz7MsV/0abHwSj+D0KBmL+C/mteQ44AhkJPh0ZJVXj6kSxuf
-        mgvLdzEHDT3SCwMZZCw1Xmex7deRUwv4ojkNWQdyJBgrWgtLd+ni+idmaekA8oLUNJ/Mz5rj1LUFBiPz
-        rQgLQDyACGcJXKtVah7Q5trHZnFxn+BVDoaz4JGQPSIWvXrOIfOsWmAglDG84QwcJAD5KUyGRnJWsblP
-        G+9+aBaaewSvFnXs5f1wqDbLi7mIOXR9Xi3gxeLwLDCHBwF5C3id+K5mrUJ9j9bfuW/mGrvED1eLOutD
-        FpAzWIwMuazL2F7AMzxjuAGeIDAA2RNM2zW9DkzgCq18bZdWb90zc7U7ZDCa4TN0n7PXoSPsBVyBtECK
-        sRvjIMY81+tuiN3BNIErtXLVHQrvCHO+uoM562G9AirW+1WuLSAPQyTPyJ2cIt7wrAWH08rKoZmpvA/5
-        nNCdM05DUi3QP5RkcDGeVrG/NXdh7sec14AJPE8rU9mm8I4w58rbBK+a66fAnofQFujz3wBMM2YH+HiO
-        MdewLj0afMyDh1pz5S1aWvrAnCttEXy+eg+bgzPBL/uQ7QV6fQkoJoBvCGDM875BURsED4u5xvwqJ65g
-        2pot3abFxQMTGPKU6mHAHuFncUItcAUKvQMJxgwsnrLRO4CQGtYkC515EqQ/kLRmipu00Nw308VNzFu9
-        OId7WWwv0OOd4oBiz8AkiJN2jIzm1ljAK3zIAOgjfUPTVrq4QfONPTOVf4/g8+bz0MP7rrC+SbVAt3eC
-        DUDuRtHDB7JY1KQHNV7nrHplfYLA87VS+XWaq++aqdw65AnuYXPRz3vUAp4JowuA3O0Zd+Q8lnkX6Cx3
-        C12yqIuYwDO2krBEtnbHTGZhCXgUajZne4EuNzTbiDvyf0fnmbU4gedtJXNrNFPeehyKzb8MHzstn/z2
-        Ap2uuAMwxFmDxf5ROxWiF/2wBFz3j9WbR5Rh9QjenIf44oKTjQv2ApddY4C4YBXjIFnrtDWuK03vc2pj
-        xutv9r8SSzTo4yd/UfPJn9T86Q86cr2GC1x0LDBqdIgm5A7M+2U+alyGmDHzIQuPjPs5o0/3wK8tEi/T
-        Rye/25/8oVgRF2i3F8Dm/wa4CF9GMh4UGMnBPztP7U9+fzSDC7zgWCBmdPQB92mMNVZHRo9eF7n0ME3T
-        BcOv7e2eKL3UHaVvdSEiDFhXC6D5fwL8Wj75AS+J/Hl7gWcHavwNb8IpDJUMXzYAAAAASUVORK5CYII=
-</value>
-  </data>
   <data name="bbtniwidth_plus.Caption" xml:space="preserve">
     <value>Breiter</value>
   </data>
   <data name="bbtniwidth_plus.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALQCAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -858,7 +359,7 @@
   </data>
   <data name="bbtniwidth_min.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALQCAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -880,7 +381,7 @@
   </data>
   <data name="bbtniheight_plus.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAB4CAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -899,7 +400,7 @@
   </data>
   <data name="bbtniheight_min.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACECAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -914,19 +415,19 @@
         Zz4L
 </value>
   </data>
+  <data name="tslblAenderungen.Caption" xml:space="preserve">
+    <value>Noch keine Änderungen</value>
+  </data>
   <data name="RibbonControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="RibbonPageCategory1.Text" xml:space="preserve">
-    <value>RibbonPageCategory1</value>
-  </data>
   <data name="RibbonPageGroup1.Text" xml:space="preserve">
     <value>Funktionen</value>
   </data>
-  <data name="RibbonPageGroup3.Text" xml:space="preserve">
+  <data name="RibbonGroupControlFunctions.Text" xml:space="preserve">
     <value>Control-Funktionen</value>
   </data>
-  <data name="rpggrp_controls.Text" xml:space="preserve">
+  <data name="RibbonGroupControls.Text" xml:space="preserve">
     <value>Controls einfügen</value>
   </data>
   <data name="RibPGCtrlWidth.Text" xml:space="preserve">
@@ -939,22 +440,13 @@
     <value>Start</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1199, 146</value>
+    <value>1199, 132</value>
   </data>
-  <data name="&gt;&gt;RibbonControl1.Name" xml:space="preserve">
-    <value>RibbonControl1</value>
-  </data>
-  <data name="&gt;&gt;RibbonControl1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;RibbonControl1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
-    <value>4</value>
+  <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 587</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1199, 21</value>
+    <value>1199, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -966,8 +458,128 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.Name" xml:space="preserve">
+    <value>RibbonControl1</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;RibbonControl1.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
+  <data name="pgControlsNew.Size" type="System.Drawing.Size, System.Drawing">
+    <value>375, 455</value>
+  </data>
+  <data name="pgControlsNew.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;pgControlsNew.Name" xml:space="preserve">
+    <value>pgControlsNew</value>
+  </data>
+  <data name="&gt;&gt;pgControlsNew.Type" xml:space="preserve">
+    <value>DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;pgControlsNew.Parent" xml:space="preserve">
+    <value>Panel1</value>
+  </data>
+  <data name="&gt;&gt;pgControlsNew.ZOrder" xml:space="preserve">
+    <value>0</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, 2, 3, 2</value>
+  </data>
+  <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>375, 455</value>
+  </data>
+  <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>23</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>SplitContainerDesigner.Panel2</value>
+  </data>
+  <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerDesigner.Panel2.Name" xml:space="preserve">
+    <value>SplitContainerDesigner.Panel2</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerDesigner.Panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitterPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerDesigner.Panel2.Parent" xml:space="preserve">
+    <value>SplitContainerDesigner</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerDesigner.Panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="SplitContainerDesigner.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1199, 455</value>
+  </data>
+  <data name="SplitContainerDesigner.SplitterDistance" type="System.Int32, mscorlib">
+    <value>820</value>
+  </data>
+  <data name="SplitContainerDesigner.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerDesigner.Name" xml:space="preserve">
+    <value>SplitContainerDesigner</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerDesigner.Type" xml:space="preserve">
+    <value>System.Windows.Forms.SplitContainer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerDesigner.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;SplitContainerDesigner.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>368, 17</value>
+  </metadata>
+  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>206, 17</value>
+  </metadata>
+  <metadata name="TBDD_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1141, 56</value>
+  </metadata>
+  <metadata name="GridControlContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="MenuItemAddColumn.Size" type="System.Drawing.Size, System.Drawing">
+    <value>169, 22</value>
+  </data>
+  <data name="MenuItemAddColumn.Text" xml:space="preserve">
+    <value>Spalte hinzufügen</value>
+  </data>
+  <data name="GridControlContextMenu.Size" type="System.Drawing.Size, System.Drawing">
+    <value>170, 26</value>
+  </data>
+  <data name="&gt;&gt;GridControlContextMenu.Name" xml:space="preserve">
+    <value>GridControlContextMenu</value>
+  </data>
+  <data name="&gt;&gt;GridControlContextMenu.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <metadata name="TBPM_PROFILE_CONTROLSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>647, 17</value>
   </metadata>
@@ -1001,9 +613,6 @@
   <data name="RibbonPageGroup4.Text" xml:space="preserve">
     <value>RibbonPageGroup4</value>
   </data>
-  <metadata name="SnapDockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>533, 95</value>
-  </metadata>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -1445,43 +1054,7 @@
     <value>3, 4, 3, 4</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Validation-Designer</value>
-  </data>
-  <data name="&gt;&gt;TBPM_PROFILE_CONTROLSBindingSource.Name" xml:space="preserve">
-    <value>TBPM_PROFILE_CONTROLSBindingSource</value>
-  </data>
-  <data name="&gt;&gt;TBPM_PROFILE_CONTROLSBindingSource.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingSource, 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>
-  <data name="&gt;&gt;DD_DMSLiteDataSet.Type" xml:space="preserve">
-    <value>DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;TBDD_CONNECTIONBindingSource.Name" xml:space="preserve">
-    <value>TBDD_CONNECTIONBindingSource</value>
-  </data>
-  <data name="&gt;&gt;TBDD_CONNECTIONBindingSource.Type" xml:space="preserve">
-    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tslblAenderungen.Name" xml:space="preserve">
-    <value>tslblAenderungen</value>
-  </data>
-  <data name="&gt;&gt;tslblAenderungen.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;ToolTip1.Name" xml:space="preserve">
-    <value>ToolTip1</value>
-  </data>
-  <data name="&gt;&gt;ToolTip1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;MenuItemAddColumn.Name" xml:space="preserve">
-    <value>MenuItemAddColumn</value>
-  </data>
-  <data name="&gt;&gt;MenuItemAddColumn.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>Formular Designer</value>
   </data>
   <data name="&gt;&gt;bbtnItemFinishSQL.Name" xml:space="preserve">
     <value>bbtnItemFinishSQL</value>
@@ -1597,11 +1170,11 @@
   <data name="&gt;&gt;bbtniheight_min.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RibbonPageCategory1.Name" xml:space="preserve">
-    <value>RibbonPageCategory1</value>
+  <data name="&gt;&gt;tslblAenderungen.Name" xml:space="preserve">
+    <value>tslblAenderungen</value>
   </data>
-  <data name="&gt;&gt;RibbonPageCategory1.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.Ribbon.RibbonPageCategory, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="&gt;&gt;tslblAenderungen.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
     <value>RibbonPage1</value>
@@ -1615,16 +1188,16 @@
   <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RibbonPageGroup3.Name" xml:space="preserve">
-    <value>RibbonPageGroup3</value>
+  <data name="&gt;&gt;RibbonGroupControlFunctions.Name" xml:space="preserve">
+    <value>RibbonGroupControlFunctions</value>
   </data>
-  <data name="&gt;&gt;RibbonPageGroup3.Type" xml:space="preserve">
+  <data name="&gt;&gt;RibbonGroupControlFunctions.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;rpggrp_controls.Name" xml:space="preserve">
-    <value>rpggrp_controls</value>
+  <data name="&gt;&gt;RibbonGroupControls.Name" xml:space="preserve">
+    <value>RibbonGroupControls</value>
   </data>
-  <data name="&gt;&gt;rpggrp_controls.Type" xml:space="preserve">
+  <data name="&gt;&gt;RibbonGroupControls.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;RibPGCtrlWidth.Name" xml:space="preserve">
@@ -1639,6 +1212,36 @@
   <data name="&gt;&gt;RibPGCtrlheight.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;TBPM_PROFILE_CONTROLSBindingSource.Name" xml:space="preserve">
+    <value>TBPM_PROFILE_CONTROLSBindingSource</value>
+  </data>
+  <data name="&gt;&gt;TBPM_PROFILE_CONTROLSBindingSource.Type" xml:space="preserve">
+    <value>System.Windows.Forms.BindingSource, 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>
+  <data name="&gt;&gt;DD_DMSLiteDataSet.Type" xml:space="preserve">
+    <value>DD_ProcessManager.DD_DMSLiteDataSet, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;TBDD_CONNECTIONBindingSource.Name" xml:space="preserve">
+    <value>TBDD_CONNECTIONBindingSource</value>
+  </data>
+  <data name="&gt;&gt;TBDD_CONNECTIONBindingSource.Type" xml:space="preserve">
+    <value>System.Windows.Forms.BindingSource, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolTip1.Name" xml:space="preserve">
+    <value>ToolTip1</value>
+  </data>
+  <data name="&gt;&gt;ToolTip1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MenuItemAddColumn.Name" xml:space="preserve">
+    <value>MenuItemAddColumn</value>
+  </data>
+  <data name="&gt;&gt;MenuItemAddColumn.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;TBPM_PROFILE_CONTROLSTableAdapter.Name" xml:space="preserve">
     <value>TBPM_PROFILE_CONTROLSTableAdapter</value>
   </data>
@@ -1705,12 +1308,6 @@
   <data name="&gt;&gt;RibbonPageGroup4.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;SnapDockManager1.Name" xml:space="preserve">
-    <value>SnapDockManager1</value>
-  </data>
-  <data name="&gt;&gt;SnapDockManager1.Type" xml:space="preserve">
-    <value>DevExpress.Snap.Extensions.SnapDockManager, DevExpress.Snap.v21.2.Extensions, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmFormDesigner</value>
   </data>

app/DD_PM_WINDREAM/frmFormDesigner.vb

@@ -6,6 +6,7 @@ Imports DevExpress.XtraGrid.Views.Grid
 Imports DevExpress.XtraGrid.Views.Grid.ViewInfo
 Imports DigitalData.Controls.LookupGrid
 Imports DigitalData.Modules.Language.Utils
+Imports DigitalData.Modules.Language
 Imports System.Drawing
 Imports DigitalData.GUIs.Common
 
@@ -14,10 +15,11 @@ Public Class frmFormDesigner
     Public ProfileName As String
     Public ProfileObjectType As String
     Public Designer_Locked As Boolean = True
-    Public ControlSelected As String
+    Public ControlSelected As String = ""
 
     ' Control Variables
     Private CurrentControl As Control = Nothing
+    Private _Logger = LOGCONFIG.GetLogger()
 
     ' Movement Variables
     Private Mouse_IsPressed As Boolean
@@ -34,9 +36,25 @@ Public Class frmFormDesigner
 
     Private CurrentColumnId As Integer = 0
 
+    Public Sub Reload_ControlNameList()
+        _Logger.debug("Reloading control name list")
+        Dim oControlNameList = DatabaseFallback.GetDatatableECM($"
+            SELECT NAME 
+            FROM TBPM_PROFILE_CONTROLS
+            WHERE 
+            PROFIL_ID = {CURRENT_ProfilGUID} AND
+            CTRL_TYPE <> 'LBL'
+            ORDER BY NAME"
+        )
+        CURRENT_CONTROL_NAME_LIST = oControlNameList.AsEnumerable().
+            Select(Function(row) row.ItemEx("NAME", String.Empty)).
+            ToList()
+        _Logger.debug("Reloading control name list done!")
+    End Sub
 
     Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
+
             ClassControlCreator.Logger = LOGCONFIG.GetLoggerFor("ControlCreator")
             BarButtonItem3.Caption = "Designer locked"
             BarButtonItem3.ItemAppearance.Normal.BackColor = Color.Red
@@ -44,7 +62,9 @@ Public Class frmFormDesigner
             Mouse_IsPressed = False
             RibPGCtrlheight.Enabled = False
             RibPGCtrlWidth.Enabled = False
-            rpggrp_controls.Enabled = False
+            RibbonGroupControls.Enabled = False
+            RibbonGroupControlFunctions.Enabled = False
+
             ' Setzt den typ des SQL-Befehls für frmSQL_DESIGNER
             CURRENT_DESIGN_TYPE = "INPUT_INDEX"
             CHANGES_FORM_DESIGN = False
@@ -93,7 +113,7 @@ Public Class frmFormDesigner
             End If
 
             'Catch ex As Exception
-            '    LOGGER.Error(ex)
+            '    _Logger.Error(ex)
             '    MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
             'End Try
 
@@ -104,13 +124,13 @@ Public Class frmFormDesigner
                 TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = CONNECTION_STRING_ECM
                 TBDD_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBDD_CONNECTION)
             Catch ex As Exception
-                LOGGER.Error(ex)
+                _LOGGER.Error(ex)
                 MsgBox("Fehler bei Laden der Connection-Strings und Grunddaten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
             End Try
 
             LoadControls()
         Catch ex As Exception
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "error loading form:")
         End Try
     End Sub
@@ -143,7 +163,8 @@ Public Class frmFormDesigner
         CURRENT_DESIGN_TYPE = "FINAL_INDEX"
 
         ' Beim Schließen das PropertyGrid leeren
-        pgControls.SelectedObject = Nothing
+        'pgControls.SelectedObject = Nothing
+        pgControlsNew.SelectedObject = Nothing
     End Sub
 
     ''' <summary>
@@ -293,7 +314,7 @@ Public Class frmFormDesigner
                 End Select
             Next
         Catch ex As Exception
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
             MsgBox("Fehler bei LoadControls " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
         End Try
 
@@ -308,7 +329,7 @@ Public Class frmFormDesigner
     '    Try
     '        TBPM_PROFILE_CONTROLSBindingSource.Clear()
     '    Catch ex As Exception
-    '        LOGGER.Error(ex)
+    '        _Logger.Error(ex)
     '    End Try
     'End Sub
 
@@ -497,9 +518,9 @@ Public Class frmFormDesigner
     '                pnldesigner.Controls.Add(oButton)
     '        End Select
     '    Catch ex As Exception
-    '        LOGGER.Error(ex)
-    '        LOGGER.Info($"Error while Adding new control {e.Data.GetData(DataFormats.Text)}:")
-    '        LOGGER.Info(ex)
+    '        _Logger.Error(ex)
+    '        _Logger.Info($"Error while Adding new control {e.Data.GetData(DataFormats.Text)}:")
+    '        _Logger.Info(ex)
     '    End Try
     'End Sub
 
@@ -587,7 +608,7 @@ Public Class frmFormDesigner
                 GridControlContextMenu.Show(Cursor.Position.X, Cursor.Position.Y)
             End If
         Catch ex As Exception
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
             MsgBox("Error while loading Column Configuration: " & vbCrLf & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Sub
@@ -606,7 +627,7 @@ Public Class frmFormDesigner
                 End If
             End If
         Catch ex As Exception
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
             MsgBox(ex.Message, MsgBoxStyle.Critical, "DeleteControl:")
         End Try
     End Sub
@@ -636,7 +657,7 @@ Public Class frmFormDesigner
             CurrentControl = sender
             Mouse_BeginLocation = e.Location
             sender.BringToFront()
-            RibbonPageGroup3.Enabled = True
+            RibbonGroupControlFunctions.Enabled = True
             Mouse_IsPressed = True
             RibPGCtrlheight.Enabled = True
             RibPGCtrlWidth.Enabled = True
@@ -662,7 +683,9 @@ Public Class frmFormDesigner
             Mouse_IsMoving = False
 
             Dim CurrentPosition = CurrentControl.Location
-            Dim OldPosition As Point = DirectCast(pgControls.SelectedObject, BaseProperties).Location
+
+            'Dim OldPosition As Point = DirectCast(pgControls.SelectedObject, BaseProperties).Location
+            Dim OldPosition As Point = DirectCast(pgControlsNew.SelectedObject, BaseProperties).Location
 
             If CurrentPosition.X = OldPosition.X + 2 And CurrentPosition.Y = OldPosition.Y + 2 Then
                 CurrentControl.Location = New Point(CurrentPosition.X - 2, CurrentPosition.Y - 2)
@@ -694,7 +717,9 @@ Public Class frmFormDesigner
                 CurrentControl.Location = New Point(CurrentControl.Location.X, pnldesigner.Height - CurrentControl.Height)
             End If
 
-            DirectCast(pgControls.SelectedObject, BaseProperties).Location = CurrentControl.Location
+            'DirectCast(pgControls.SelectedObject, BaseProperties).Location = CurrentControl.Location
+            DirectCast(pgControlsNew.SelectedObject, BaseProperties).Location = CurrentControl.Location
+            pgControlsNew.UpdateData()
 
             UpdateSingleValue("X_LOC", CurrentControl.Location.X)
             UpdateSingleValue("Y_LOC", CurrentControl.Location.Y)
@@ -702,7 +727,7 @@ Public Class frmFormDesigner
             MyBase.Cursor = Cursors.Default
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical)
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
             Mouse_IsMoving = False
             Mouse_IsPressed = False
         End Try
@@ -731,7 +756,7 @@ Public Class frmFormDesigner
                 End If
             End If
         Catch ex As Exception
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
             Mouse_IsMoving = False
         End Try
     End Sub
@@ -779,11 +804,16 @@ Public Class frmFormDesigner
         obj = CreatePropsObject(obj, row)
         obj.Indicies = indicies
         obj.ReadOnly = StrToBool(row.Item("READ_ONLY"))
+        obj.SaveChangeOnReadOnly = StrToBool(row.Item("SAVE_CHANGE_ON_ENABLED"))
         obj.Required = StrToBool(row.Item("VALIDATION"))
         obj.Active = StrToBool(row.Item("CONTROL_ACTIVE"))
         obj.Index = NotNull(row.Item("INDEX_NAME"), "")
         obj.DefaultValue = NotNull(row.Item("DEFAULT_VALUE"), Nothing)
-        obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG"))
+
+        ' Default value for ConnectionID
+        Dim oConnectionId = row.ItemEx("CONNECTION_ID", 0)
+        obj.SQLCommand = New SQLValue(row.Item("SQL_UEBERPRUEFUNG"), oConnectionId)
+        obj.SQLConnection = oConnectionId
         Return obj
     End Function
 
@@ -793,16 +823,17 @@ Public Class frmFormDesigner
             Dim oDatatable As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS
             Dim oRow As DataRow
 
-            pgControls.Enabled = True
+            'pgControls.Enabled = True
+            pgControlsNew.Enabled = True
 
             ' Beim Laden der Eigenschaften eines Controls muss die ganze Datatable neu geladen werden
             ' Nicht wirklich, aber gibt gerade keine bessere Möglichkeit, ohne alle SQL Abfragen selbst auszuführen
             Try
                 TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, USER_LANGUAGE, ProfileId)
             Catch ex As Exception
-                LOGGER.Error(ex)
-                LOGGER.Info("Error while executing TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil in LoadControlProperties:")
-                LOGGER.Info(ex)
+                _LOGGER.Error(ex)
+                _LOGGER.Info("Error while executing TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil in LoadControlProperties:")
+                _LOGGER.Info(ex)
             End Try
 
             Dim oControlId = DirectCast(sender.Tag, ClassControlCreator.ControlMetadata).Guid
@@ -813,7 +844,7 @@ Public Class frmFormDesigner
 
             ' Control-Id wurde nicht in DataRow gefunden
             If IsNothing(oRow) Then
-                LOGGER.Info($"Error while filtering Controls by Guid '{oControlId}' in LoadControlProperties:")
+                _LOGGER.Info($"Error while filtering Controls by Guid '{oControlId}' in LoadControlProperties:")
                 MsgBox($"Control mit der Id {oControlId} wurde nicht gefunden!", MsgBoxStyle.Critical, "Fehler beim Laden der Control Eigenschaften")
 
                 Exit Sub
@@ -923,17 +954,21 @@ Public Class frmFormDesigner
             End If
 
             ' Zum Schluss wird das Eigenschaften-Objekt ins PropertyGrid geladen
-            pgControls.SelectedObject = props
+            'pgControls.SelectedObject = props
+            pgControlsNew.SelectedObject = props
         Catch ex As Exception
             MsgBox(ex.Message, MsgBoxStyle.Critical)
         End Try
 
     End Sub
 
-    Private Sub pgControls_PropertyValueChanged(s As Object, e As PropertyValueChangedEventArgs) Handles pgControls.PropertyValueChanged
-        Dim oldValue As Object = e.OldValue
-        Dim newValue = e.ChangedItem.Value
-        Dim prop As String = e.ChangedItem.Label
+    Private Sub pgControlsNew_RowChanged(sender As Object, e As DevExpress.XtraVerticalGrid.Events.RowChangedEventArgs) Handles pgControlsNew.RowChanged
+        If e.ChangeType <> DevExpress.XtraVerticalGrid.RowChangeTypeEnum.Value Then
+            Exit Sub
+        End If
+
+        Dim prop = e.Properties.FieldName
+        Dim newValue = e.Properties.Value
 
         Select Case prop
             Case "DisplayAsLookUpControl"
@@ -996,7 +1031,8 @@ Public Class frmFormDesigner
 
             Case "ReadOnly"
                 UpdateSingleValue("READ_ONLY", IIf(newValue = True, 1, 0))
-
+            Case "SaveChangeOnReadOnly"
+                UpdateSingleValue("SAVE_CHANGE_ON_ENABLED", IIf(newValue = True, 1, 0))
             Case "Font"
                 Dim font As Font = newValue
                 Dim fontSize As Integer = Math.Truncate(font.SizeInPoints)
@@ -1012,29 +1048,162 @@ Public Class frmFormDesigner
                 CurrentControl.ForeColor = color
             Case "SQLCommand"
                 UpdateSingleValue("SQL_UEBERPRUEFUNG", newValue)
-                UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID)
                 UpdateSingleValue("CHOICE_LIST", "")
 
             Case "Enable_SQL"
                 UpdateSingleValue("SQL_ENABLE", newValue)
-                UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID)
                 UpdateSingleValue("CHOICE_LIST", "")
+
             Case "Enable_SQL_OnLoad"
                 UpdateSingleValue("SQL_ENABLE_ON_LOAD", newValue)
-                UpdateSingleValue("SQL_ENABLE_ON_LOAD_CONID", CURRENT_CONN_ID)
                 UpdateSingleValue("CHOICE_LIST", "")
+
             Case "Override_SQL"
                 UpdateSingleValue("SQL2", newValue)
-                UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID)
                 UpdateSingleValue("CHOICE_LIST", "")
+
             Case "SetControlData"
                 UpdateSingleValue("SET_CONTROL_DATA", newValue)
-                UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID)
                 UpdateSingleValue("CHOICE_LIST", "")
+
+            Case "ChoiceList"
+                UpdateSingleValue("CHOICE_LIST", newValue)
+                UpdateSingleValue("SQL_UEBERPRUEFUNG", "")
+
+            Case "MultiSelect"
+                UpdateSingleValue("MULTISELECT", IIf(newValue = True, 1, 0))
+
+            Case "AllowAddNewValues"
+                UpdateSingleValue("VKT_ADD_ITEM", IIf(newValue = True, 1, 0))
+
+            Case "PreventDuplicates"
+                UpdateSingleValue("VKT_PREVENT_MULTIPLE_VALUES", IIf(newValue = True, 1, 0))
+
+            Case "DefaultValue"
+                UpdateSingleValue("DEFAULT_VALUE", newValue)
+
+            Case "Regex"
+                UpdateSingleValue("REGEX_MATCH", newValue)
+
+            Case "RegexMessage"
+                UpdateSingleValue("REGEX_MESSAGE_DE", newValue)
+            Case "Active"
+                UpdateSingleValue("CONTROL_ACTIVE", IIf(newValue = True, 1, 0))
+            Case "CtrlImage"
+                Dim myPath As ImageValue = newValue
+                UpdateImage(myPath.Value)
+        End Select
+    End Sub
+
+
+
+    Private Sub pgControls_PropertyValueChanged(s As Object, e As PropertyValueChangedEventArgs)
+        Dim oldValue As Object = e.OldValue
+        Dim newValue = e.ChangedItem.Value
+
+        'Dim prop As String = e.ChangedItem.Label
+        Dim prop As String = e.ChangedItem.PropertyDescriptor.Name
+
+
+        Select Case prop
+            Case "DisplayAsLookUpControl"
+                If UpdateSingleValue("CTRL_TYPE", "LOOKUP") = True Then
+                    MsgBox("Type has been changed. Controls will be reloaded!", MsgBoxStyle.Information, "")
+                    LoadControls()
+                End If
+            Case "DisplayAsComboBox"
+                If UpdateSingleValue("CTRL_TYPE", "CMB") = True Then
+                    MsgBox("Type has been changed. Controls will be reloaded!", MsgBoxStyle.Information, "")
+                    LoadControls()
+                End If
+            Case "Location"
+                UpdateSingleValue("X_LOC", DirectCast(newValue, Point).X)
+                UpdateSingleValue("Y_LOC", DirectCast(newValue, Point).Y)
+
+                CurrentControl.Location = newValue
+
+            Case "X"
+                UpdateSingleValue("X_LOC", CInt(newValue))
+
+                CurrentControl.Location = New Point(newValue, CurrentControl.Location.Y)
+
+            Case "Y"
+                UpdateSingleValue("Y_LOC", CInt(newValue))
+
+                CurrentControl.Location = New Point(CurrentControl.Location.X, newValue)
+
+            Case "Size"
+                UpdateSingleValue("WIDTH", DirectCast(newValue, Size).Width)
+                UpdateSingleValue("HEIGHT", DirectCast(newValue, Size).Height)
+
+                CurrentControl.Size = newValue
+
+            Case "Width"
+                UpdateSingleValue("WIDTH", CInt(newValue))
+
+                CurrentControl.Size = New Size(newValue, CurrentControl.Size.Height)
+
+            Case "Height"
+                UpdateSingleValue("HEIGHT", CInt(newValue))
+
+                CurrentControl.Size = New Size(CurrentControl.Size.Width, newValue)
+
+            Case "Name"
+                UpdateSingleValue("NAME", newValue)
+
+                CurrentControl.Name = newValue
+
+            Case "Index"
+                UpdateSingleValue("INDEX_NAME", newValue)
+
+            Case "Text"
+                UpdateSingleValue("CTRL_TEXT", newValue)
+
+                CurrentControl.Text = newValue
+
+            Case "Required"
+                UpdateSingleValue("VALIDATION", IIf(newValue = True, 1, 0))
+
+            Case "ReadOnly"
+                UpdateSingleValue("READ_ONLY", IIf(newValue = True, 1, 0))
+            Case "SaveChangeOnReadOnly"
+                UpdateSingleValue("SAVE_CHANGE_ON_ENABLED", IIf(newValue = True, 1, 0))
+            Case "Font"
+                Dim font As Font = newValue
+                Dim fontSize As Integer = Math.Truncate(font.SizeInPoints)
+                UpdateSingleValue("FONT_SIZE", fontSize)
+                UpdateSingleValue("FONT_FAMILY", font.FontFamily.Name)
+                UpdateSingleValue("FONT_STYLE", CInt(font.Style))
+
+                CurrentControl.Font = font
+            Case "TextColor"
+                Dim color As Color = newValue
+                UpdateSingleValue("FONT_COLOR", ColorTranslator.ToWin32(color))
+
+                CurrentControl.ForeColor = color
+            Case "SQLCommand"
+                UpdateSingleValue("SQL_UEBERPRUEFUNG", newValue)
+                UpdateSingleValue("CHOICE_LIST", "")
+
+            Case "Enable_SQL"
+                UpdateSingleValue("SQL_ENABLE", newValue)
+                UpdateSingleValue("CHOICE_LIST", "")
+
+            Case "Enable_SQL_OnLoad"
+                UpdateSingleValue("SQL_ENABLE_ON_LOAD", newValue)
+                UpdateSingleValue("CHOICE_LIST", "")
+
+            Case "Override_SQL"
+                UpdateSingleValue("SQL2", newValue)
+                UpdateSingleValue("CHOICE_LIST", "")
+
+            Case "SetControlData"
+                UpdateSingleValue("SET_CONTROL_DATA", newValue)
+                UpdateSingleValue("CHOICE_LIST", "")
+
             Case "ChoiceList"
                 UpdateSingleValue("CHOICE_LIST", newValue)
                 UpdateSingleValue("SQL_UEBERPRUEFUNG", "")
-                UpdateSingleValue("CONNECTION_ID", "NULL")
 
             Case "MultiSelect"
                 UpdateSingleValue("MULTISELECT", IIf(newValue = True, 1, 0))
@@ -1076,16 +1245,17 @@ Public Class frmFormDesigner
             cmd.ExecuteNonQuery()
             conn.Close()
 
-            tslblAenderungen.Visible = True
-            tslblAenderungen.Text = "Änderungen gespeichert - " & Now
+            tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+            tslblAenderungen.Caption = "Änderungen gespeichert - " & Now
+
             CHANGES_FORM_DESIGN = True
             Return True
 
         Catch ex As Exception
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
             Dim oMsg = $"UpdateImage - Error while saving Control (Id: {CURRENT_CONTROL_ID}): {vbCrLf}{ex.Message}"
             MsgBox(oMsg)
-            LOGGER.Info(oMsg)
+            _LOGGER.Info(oMsg)
             Return False
         End Try
     End Function
@@ -1099,12 +1269,14 @@ Public Class frmFormDesigner
         ElseIf TypeOf value Is SQLValue Then
             Dim v As SQLValue = value
             escapedValue = $"'{v.Value.Replace("'", "''")}'"
+
+            UpdateSingleValue("CONNECTION_ID", v.ConnectionId)
         End If
 
         Try
             If DatabaseFallback.ExecuteNonQueryECM($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue}, CHANGED_WHO = '{USER_USERNAME}' WHERE GUID = {guid}") = True Then
-                tslblAenderungen.Visible = True
-                tslblAenderungen.Text = "Änderungen gespeichert - " & Now
+                tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                tslblAenderungen.Caption = "Änderungen gespeichert - " & Now
                 If columnName.ToUpper = "CTRL_TEXT" Then
                     Dim oSQL = $"EXEC PRPM_CHANGE_CONTROL_CAPTION {guid},{escapedValue},'{USER_USERNAME}','{USER_LANGUAGE}'"
                     DatabaseFallback.ExecuteNonQueryECM(oSQL)
@@ -1116,10 +1288,10 @@ Public Class frmFormDesigner
 
 
         Catch ex As Exception
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
             Dim oMsg = $"UpdateSingleValue - Fehler beim Speichern von Control (Id: {guid}, column: {columnName}): {vbCrLf}{ex.Message}"
             MsgBox(oMsg)
-            LOGGER.Info(oMsg)
+            _LOGGER.Info(oMsg)
             Return False
         End Try
     End Function
@@ -1130,15 +1302,15 @@ Public Class frmFormDesigner
             Dim oColumnName As String = "colNew" & oGuid
             Dim oColumnCaption As String = "New Column " & oGuid
             If DatabaseFallback.ExecuteNonQueryECM($"INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE) VALUES({CURRENT_CONTROL_ID}, '{oColumnName}', '{oColumnCaption}', 95)") = True Then
-                tslblAenderungen.Visible = True
-                tslblAenderungen.Text = "Änderungen gespeichert - " & Now
+                tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+                tslblAenderungen.Caption = "Änderungen gespeichert - " & Now
 
                 LoadControls()
             End If
         Catch ex As Exception
             Dim oMsg = $"MenuItemAddColumn_Click - Fehler beim Hinzufügen von einer neuen Spalte: {vbCrLf}{ex.Message}"
             MsgBox(oMsg)
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
         End Try
     End Sub
 
@@ -1148,37 +1320,43 @@ Public Class frmFormDesigner
             Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {ProfileId}"
             Dim oldSQL = DatabaseFallback.GetScalarValueECM(oSQL)
             Dim oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) With {
-            .SQLCommand = oldSQL,
-            .SQLConnection = 1
-         }
+                .SQLCommand = oldSQL,
+                .SQLConnection = 1,
+                .PlaceholdersManualPrefix = "CTRL",
+                .PlaceholdersManualTitle = "Controls",
+                .PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name)
+            }
             oForm.ShowDialog()
 
             If oForm.DialogResult = DialogResult.OK Then
                 If oldSQL <> oForm.SQLCommand Then
                     Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_BTN_FINISH = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}"
                     If DatabaseFallback.ExecuteNonQueryECM(oUpdate) = True Then
-                        tslblAenderungen.Text = $"Profile SQLFinish saved - {Now.ToLongTimeString}"
-                        tslblAenderungen.Visible = True
+                        tslblAenderungen.Caption = $"Profile SQLFinish saved - {Now.ToLongTimeString}"
+                        tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
                         CHANGES_FORM_DESIGN = True
                     Else
-                        tslblAenderungen.Visible = False
+                        tslblAenderungen.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
                     End If
 
                 End If
             End If
         Catch ex As Exception
             MsgBox("Error in Saving Profile SQLFinish: " & vbNewLine & vbNewLine & ex.Message)
-            LOGGER.Error(ex)
+            _LOGGER.Error(ex)
         End Try
     End Sub
 
     Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
         If CurrentControl Is Nothing = False Then
             DeleteControl(CurrentControl.Name)
-            pgControls.Enabled = False
+            'pgControls.Enabled = False
+            pgControlsNew.Enabled = False
             CurrentControl = Nothing
             RibPGCtrlheight.Enabled = False
             RibPGCtrlWidth.Enabled = False
+
+            Reload_ControlNameList()
         End If
     End Sub
 
@@ -1190,13 +1368,17 @@ Public Class frmFormDesigner
         If BarButtonItem3.Caption = "Designer locked" Then
             BarButtonItem3.Caption = "Designer active"
             BarButtonItem3.ItemAppearance.Normal.BackColor = Color.LightSteelBlue
-            rpggrp_controls.Enabled = True
+            RibbonGroupControls.Enabled = True
+            RibbonGroupControlFunctions.Enabled = True
             Designer_Locked = False
         Else
             BarButtonItem3.Caption = "Designer locked"
             BarButtonItem3.ItemAppearance.Normal.BackColor = Color.Red
             Designer_Locked = True
-            rpggrp_controls.Enabled = False
+
+            RibbonGroupControls.Enabled = False
+            RibbonGroupControlFunctions.Enabled = False
+
             If Me.Cursor = Cursors.Cross Then
                 Mouse_IsPressed = False
                 Me.Cursor = Cursors.Default
@@ -1208,6 +1390,7 @@ Public Class frmFormDesigner
         If Designer_Locked Then
             Exit Sub
         End If
+
         Me.Cursor = Cursors.Cross
         Mouse_IsPressed = True
         CurrentControl = Nothing
@@ -1252,7 +1435,8 @@ Public Class frmFormDesigner
         If Designer_Locked Then
             Exit Sub
         End If
-        If Me.Cursor = Cursors.Cross And Mouse_IsPressed = True Then
+
+        If Cursor = Cursors.Cross And Mouse_IsPressed = True Then
             Dim cursorPosition As Point = pnldesigner.PointToClient(Cursor.Position)
             Mouse_IsPressed = False
 
@@ -1392,25 +1576,33 @@ Public Class frmFormDesigner
                             .ReadOnly = False
                         }
 
-
                         pnldesigner.Controls.Add(oButton)
                 End Select
+
+                If IsNothing(ControlSelected) = False Then
+                    Reload_ControlNameList()
+                End If
+
                 If Not IsNothing(CurrentControl) Then
                     RibPGCtrlheight.Enabled = True
                     RibPGCtrlWidth.Enabled = True
                 End If
             Catch ex As Exception
-                LOGGER.Error(ex)
-                LOGGER.Info($"Error while Adding new control {ControlSelected}:")
-                LOGGER.Info(ex)
+                _LOGGER.Error(ex)
+                _LOGGER.Info($"Error while Adding new control {ControlSelected}:")
+                _LOGGER.Info(ex)
             End Try
             Me.Cursor = Cursors.Default
+            ControlSelected = ""
         End If
     End Sub
 
     Private Sub bbtniwidth_plus_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniwidth_plus.ItemClick
         If CurrentControl Is Nothing = False Then
             CurrentControl.Size = New Size(CurrentControl.Width + 5, CurrentControl.Height)
+            DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size
+            pgControlsNew.UpdateData()
+
             UpdateSingleValue("WIDTH", CurrentControl.Size.Width)
         End If
     End Sub
@@ -1423,6 +1615,9 @@ Public Class frmFormDesigner
                 Exit Sub
             End If
             CurrentControl.Size = New Size(newWidth, CurrentControl.Height)
+            DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size
+            pgControlsNew.UpdateData()
+
             UpdateSingleValue("WIDTH", CurrentControl.Size.Width)
         End If
     End Sub
@@ -1441,6 +1636,9 @@ Public Class frmFormDesigner
             End If
 
             CurrentControl.Size = New Size(CurrentControl.Width, newHeight)
+            DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size
+            pgControlsNew.UpdateData()
+
             UpdateSingleValue("HEIGHT", newHeight)
         End If
     End Sub
@@ -1454,7 +1652,12 @@ Public Class frmFormDesigner
             End If
 
             CurrentControl.Size = New Size(CurrentControl.Width, newHeight)
+            DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size
+            pgControlsNew.UpdateData()
+
             UpdateSingleValue("HEIGHT", newHeight)
         End If
     End Sub
+
+
 End Class

app/DD_PM_WINDREAM/frmMain.Designer.vb

@@ -29,7 +29,7 @@ Partial Class frmMain
         Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.GridControl_Docs = New DevExpress.XtraGrid.GridControl()
-        Me.GridViewWFItems = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.GridView_Docs = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.NavBarControl1 = New DevExpress.XtraNavBar.NavBarControl()
         Me.NavBarGroupProfiles = New DevExpress.XtraNavBar.NavBarGroup()
         Me.cmsNavPane = New System.Windows.Forms.ContextMenuStrip(Me.components)
@@ -91,6 +91,7 @@ Partial Class frmMain
         Me.barItemGridFontSize = New DevExpress.XtraBars.BarEditItem()
         Me.cmbGridFontSize = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
         Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
+        Me.bsiRowCount = New DevExpress.XtraBars.BarStaticItem()
         Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
         Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -179,11 +180,10 @@ Partial Class frmMain
         Me.bwBasicData = New System.ComponentModel.BackgroundWorker()
         Me.XtraSaveFileDialog1 = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
         Me.TimerInactivity = New System.Windows.Forms.Timer(Me.components)
-        Me.bsiRowCount = New DevExpress.XtraBars.BarStaticItem()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.Panel1.SuspendLayout()
         CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.GridViewWFItems, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridView_Docs, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.cmsNavPane.SuspendLayout()
         CType(Me.bindsourcegrid, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -245,36 +245,36 @@ Partial Class frmMain
         Me.GridControl_Docs.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControl_Docs.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
         Me.GridControl_Docs.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControl_Docs.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
         Me.GridControl_Docs.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControl_Docs.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridControl_Docs.MainView = Me.GridViewWFItems
+        Me.GridControl_Docs.MainView = Me.GridView_Docs
         Me.GridControl_Docs.Name = "GridControl_Docs"
-        Me.GridControl_Docs.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewWFItems})
+        Me.GridControl_Docs.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView_Docs})
         '
-        'GridViewWFItems
+        'GridView_Docs
         '
-        Me.GridViewWFItems.Appearance.EvenRow.BackColor = System.Drawing.Color.Azure
-        Me.GridViewWFItems.Appearance.EvenRow.Options.UseBackColor = True
-        Me.GridViewWFItems.Appearance.ViewCaption.ForeColor = System.Drawing.Color.Black
-        Me.GridViewWFItems.Appearance.ViewCaption.Options.UseForeColor = True
-        Me.GridViewWFItems.Appearance.ViewCaption.Options.UseTextOptions = True
-        Me.GridViewWFItems.Appearance.ViewCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
-        Me.GridViewWFItems.GridControl = Me.GridControl_Docs
-        Me.GridViewWFItems.Name = "GridViewWFItems"
-        Me.GridViewWFItems.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewWFItems.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewWFItems.OptionsBehavior.AllowFixedGroups = DevExpress.Utils.DefaultBoolean.[True]
-        Me.GridViewWFItems.OptionsBehavior.AllowGroupExpandAnimation = DevExpress.Utils.DefaultBoolean.[True]
-        Me.GridViewWFItems.OptionsBehavior.Editable = False
-        Me.GridViewWFItems.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewWFItems.OptionsSelection.MultiSelect = True
-        Me.GridViewWFItems.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect
-        Me.GridViewWFItems.OptionsView.ColumnAutoWidth = False
-        Me.GridViewWFItems.OptionsView.EnableAppearanceEvenRow = True
-        Me.GridViewWFItems.OptionsView.ShowAutoFilterRow = True
-        Me.GridViewWFItems.OptionsView.ShowErrorPanel = DevExpress.Utils.DefaultBoolean.[True]
-        Me.GridViewWFItems.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewWFItems.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewWFItems.OptionsView.ShowViewCaption = True
-        resources.ApplyResources(Me.GridViewWFItems, "GridViewWFItems")
+        Me.GridView_Docs.Appearance.EvenRow.BackColor = System.Drawing.Color.Azure
+        Me.GridView_Docs.Appearance.EvenRow.Options.UseBackColor = True
+        Me.GridView_Docs.Appearance.ViewCaption.ForeColor = System.Drawing.Color.Black
+        Me.GridView_Docs.Appearance.ViewCaption.Options.UseForeColor = True
+        Me.GridView_Docs.Appearance.ViewCaption.Options.UseTextOptions = True
+        Me.GridView_Docs.Appearance.ViewCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near
+        Me.GridView_Docs.GridControl = Me.GridControl_Docs
+        Me.GridView_Docs.Name = "GridView_Docs"
+        Me.GridView_Docs.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView_Docs.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView_Docs.OptionsBehavior.AllowFixedGroups = DevExpress.Utils.DefaultBoolean.[True]
+        Me.GridView_Docs.OptionsBehavior.AllowGroupExpandAnimation = DevExpress.Utils.DefaultBoolean.[True]
+        Me.GridView_Docs.OptionsBehavior.Editable = False
+        Me.GridView_Docs.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView_Docs.OptionsSelection.MultiSelect = True
+        Me.GridView_Docs.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect
+        Me.GridView_Docs.OptionsView.ColumnAutoWidth = False
+        Me.GridView_Docs.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridView_Docs.OptionsView.ShowAutoFilterRow = True
+        Me.GridView_Docs.OptionsView.ShowErrorPanel = DevExpress.Utils.DefaultBoolean.[True]
+        Me.GridView_Docs.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView_Docs.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridView_Docs.OptionsView.ShowViewCaption = True
+        resources.ApplyResources(Me.GridView_Docs, "GridView_Docs")
         '
         'NavBarControl1
         '
@@ -726,6 +726,11 @@ Partial Class frmMain
         Me.BarButtonItem8.Id = 42
         Me.BarButtonItem8.Name = "BarButtonItem8"
         '
+        'bsiRowCount
+        '
+        Me.bsiRowCount.Id = 43
+        Me.bsiRowCount.Name = "bsiRowCount"
+        '
         'RibbonPageStart
         '
         Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupBasicConf, Me.RibbonPageGroup7, Me.RibbonPageGroup4})
@@ -1449,11 +1454,6 @@ Partial Class frmMain
         'TimerInactivity
         '
         '
-        'bsiRowCount
-        '
-        Me.bsiRowCount.Id = 43
-        Me.bsiRowCount.Name = "bsiRowCount"
-        '
         'frmMain
         '
         Me.Appearance.Options.UseFont = True
@@ -1475,7 +1475,7 @@ Partial Class frmMain
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         Me.Panel1.ResumeLayout(False)
         CType(Me.GridControl_Docs, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.GridViewWFItems, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridView_Docs, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.cmsNavPane.ResumeLayout(False)
         CType(Me.bindsourcegrid, System.ComponentModel.ISupportInitialize).EndInit()
@@ -1506,7 +1506,7 @@ Partial Class frmMain
     Friend WithEvents cmsNavPane As ContextMenuStrip
     Friend WithEvents tsmiValidationProfil As ToolStripMenuItem
     Friend WithEvents GridControl_Docs As DevExpress.XtraGrid.GridControl
-    Friend WithEvents GridViewWFItems As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents GridView_Docs As DevExpress.XtraGrid.Views.Grid.GridView
     Friend WithEvents bindsourcegrid As BindingSource
     Friend WithEvents Timer5Mins As Timer
     Friend WithEvents ToolTip1 As ToolTip

app/DD_PM_WINDREAM/frmMain.resx

@@ -125,7 +125,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAAdQBCAHUAQgBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAATwBCQE8AQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -204,11 +204,11 @@
   <data name="GridControl_Docs.Location" type="System.Drawing.Point, System.Drawing">
     <value>233, 0</value>
   </data>
-  <data name="GridViewWFItems.ViewCaption" xml:space="preserve">
+  <data name="GridView_Docs.ViewCaption" xml:space="preserve">
     <value>Gesamtübersicht Workflows</value>
   </data>
   <data name="GridControl_Docs.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1000, 355</value>
+    <value>1000, 347</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="GridControl_Docs.TabIndex" type="System.Int32, mscorlib">
@@ -423,7 +423,7 @@
     <value>233</value>
   </data>
   <data name="NavBarControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>233, 355</value>
+    <value>233, 347</value>
   </data>
   <data name="NavBarControl1.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -450,10 +450,10 @@
     <value>Tahoma, 9pt</value>
   </data>
   <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 151</value>
+    <value>0, 158</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1233, 355</value>
+    <value>1233, 347</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -674,7 +674,7 @@
 </value>
   </data>
   <data name="bbiProfilverwaltung.Caption" xml:space="preserve">
-    <value>Verwaltung</value>
+    <value>Profil-Verwaltung</value>
   </data>
   <data name="bbiProfilverwaltung.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1685,13 +1685,13 @@
     <value>Aktionen</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1233, 151</value>
+    <value>1233, 158</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 506</value>
+    <value>0, 505</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1233, 21</value>
+    <value>1233, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>
@@ -1997,10 +1997,10 @@
   <data name="&gt;&gt;TableAdapterManager.Type" xml:space="preserve">
     <value>DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager, DD_DMSLiteDataSet.Designer.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;GridViewWFItems.Name" xml:space="preserve">
-    <value>GridViewWFItems</value>
+  <data name="&gt;&gt;GridView_Docs.Name" xml:space="preserve">
+    <value>GridView_Docs</value>
   </data>
-  <data name="&gt;&gt;GridViewWFItems.Type" xml:space="preserve">
+  <data name="&gt;&gt;GridView_Docs.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Views.Grid.GridView, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;NavBarGroupProfiles.Name" xml:space="preserve">
@@ -2345,6 +2345,12 @@
   <data name="&gt;&gt;BarButtonItem8.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;bsiRowCount.Name" xml:space="preserve">
+    <value>bsiRowCount</value>
+  </data>
+  <data name="&gt;&gt;bsiRowCount.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve">
     <value>RibbonPageStart</value>
   </data>
@@ -2843,12 +2849,6 @@
   <data name="&gt;&gt;TimerInactivity.Type" xml:space="preserve">
     <value>System.Windows.Forms.Timer, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;bsiRowCount.Name" xml:space="preserve">
-    <value>bsiRowCount</value>
-  </data>
-  <data name="&gt;&gt;bsiRowCount.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmMain</value>
   </data>

app/DD_PM_WINDREAM/frmMain.vb

@@ -15,6 +15,7 @@ Imports DigitalData.GUIs.Common
 Imports DevExpress.XtraGrid.Views.BandedGrid
 Imports DevExpress.XtraBars.Ribbon
 Imports DigitalData.Modules.ZooFlow
+Imports DevExpress.LookAndFeel
 
 Public Class frmMain
     Private Property FormHelper As FormHelper
@@ -147,7 +148,7 @@ Public Class frmMain
         FormOpenClose = True
         LOGGER.Debug("Initializing MainForm....")
 
-        GridBuilder = New GridBuilder(GridViewWFItems)
+        GridBuilder = New GridBuilder(GridView_Docs)
         GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta)
 
         Dim oFontSettings = New List(Of FontSetting) From {
@@ -163,7 +164,7 @@ Public Class frmMain
                 FirstOrDefault()
 
         ' Create helper to save/load expanded GroupColumns at runtime
-        RefreshHelper = New RefreshHelper(LOGCONFIG, GridViewWFItems, "GUID")
+        RefreshHelper = New RefreshHelper(LOGCONFIG, GridView_Docs, "GUID")
 
         If User.Language <> "de-DE" Then
             omsgOpenWorkflow = "Please close the active workflow!"
@@ -203,7 +204,13 @@ Public Class frmMain
 
         Try
             'DataASorDB = New ClassDataASorDB
-            bsiLicenses.Caption = "Anzahl Lizenzen: " & LICENSE_COUNT
+            If User.IsAdmin = True Then
+                bsiLicenses.Caption = "Anzahl Lizenzen: " & LICENSE_COUNT
+                bsiLicenses.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+            Else
+                bsiLicenses.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+            End If
+
             LOGGER.Debug("Initializing MainForm....")
 
             If ERROR_STATE = "NO USER" Then
@@ -555,7 +562,7 @@ Public Class frmMain
 
         Try
             Dim xml As String = GetXML_LayoutName()
-            GridViewWFItems.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
+            GridView_Docs.SaveLayoutToXml(xml, OptionsLayoutBase.FullLayout)
         Catch ex As Exception
             LOGGER.Error(ex)
             LOGGER.Info("Error while saving GridLayout: " & ex.Message)
@@ -569,7 +576,7 @@ Public Class frmMain
 
         Try
             Dim oXml As String = GetXML_LayoutName()
-            GridViewWFItems.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
+            GridView_Docs.RestoreLayoutFromXml(oXml, OptionsLayoutBase.FullLayout)
         Catch ex As Exception
             LOGGER.Error(ex)
             LOGGER.Info("Error while restoring layout: " & ex.Message)
@@ -582,12 +589,12 @@ Public Class frmMain
             Dim xml As String = GetXML_LayoutName()
             IO.File.Delete(xml)
             Try
-                GridViewWFItems.Columns.Clear()
+                GridView_Docs.Columns.Clear()
             Catch ex As Exception
-                If IsNothing(GridViewWFItems) Then
+                If IsNothing(GridView_Docs) Then
                     LOGGER.Warn("Somehow GridView_Docs is nothing....")
                 Else
-                    If IsNothing(GridViewWFItems.Columns) Then
+                    If IsNothing(GridView_Docs.Columns) Then
                         LOGGER.Warn("Somehow GridView_Docs.Columns is nothing....")
 
                     End If
@@ -595,28 +602,28 @@ Public Class frmMain
                 Exit Sub
             End Try
 
-            GridViewWFItems.PopulateColumns()
-            If GridViewWFItems.Columns.Count > 0 Then
-                GridViewWFItems.Columns.Item("PROFILE_ID").Visible = False
-                GridViewWFItems.Columns.Item("GUID").Visible = False
+            GridView_Docs.PopulateColumns()
+            If GridView_Docs.Columns.Count > 0 Then
+                GridView_Docs.Columns.Item("PROFILE_ID").Visible = False
+                GridView_Docs.Columns.Item("GUID").Visible = False
                 Try
-                    GridViewWFItems.Columns.Item(FullFilepatColName).Visible = False
+                    GridView_Docs.Columns.Item(FullFilepatColName).Visible = False
                 Catch ex As Exception
 
                 End Try
                 Try
                     'GridView_Docs.Columns.Item("DocID").Visible = False
-                    GridViewWFItems.Columns.Item("TL_STATE").Visible = False
+                    GridView_Docs.Columns.Item("TL_STATE").Visible = False
                 Catch ex As Exception
 
                 End Try
 
                 Try
                     If TL_ICON = True Then
-                        GridViewWFItems.Columns.Item("ICON").MaxWidth = 24
-                        GridViewWFItems.Columns.Item("ICON").MinWidth = 24
-                        GridViewWFItems.Columns.Item("ICON").AppearanceCell.BackColor = Color.White
-                        GridViewWFItems.Columns.Item("ICON").Fixed = FixedStyle.Left
+                        GridView_Docs.Columns.Item("ICON").MaxWidth = 24
+                        GridView_Docs.Columns.Item("ICON").MinWidth = 24
+                        GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White
+                        GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left
                     End If
                 Catch ex As Exception
 
@@ -625,16 +632,16 @@ Public Class frmMain
 
                 If IDB_ACTIVE = True Then
                     Try
-                        If GridViewWFItems.Columns.Item("CONV_YN") IsNot Nothing Then
-                            GridViewWFItems.Columns.Item("CONV_YN").Visible = False
+                        If GridView_Docs.Columns.Item("CONV_YN") IsNot Nothing Then
+                            GridView_Docs.Columns.Item("CONV_YN").Visible = False
                         End If
                     Catch ex As Exception
                         LOGGER.Info("ResetLayout - Check wether Column CONV_YN is part of select/view..now checking CONVERSATION")
                     End Try
                     Try
-                        GridViewWFItems.Columns.Item("CONVERSATION").MaxWidth = 24
-                        GridViewWFItems.Columns.Item("CONVERSATION").MinWidth = 24
-                        GridViewWFItems.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left
+                        GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24
+                        GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24
+                        GridView_Docs.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left
                     Catch ex As Exception
                         LOGGER.Info("ResetLayout - Column CONVERSATION obviously is not part of GridView_Docs")
                     End Try
@@ -644,12 +651,12 @@ Public Class frmMain
                 Try
                     Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "")
                     oReducedColName = oReducedColName.Replace("]", "")
-                    GridViewWFItems.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime
-                    GridViewWFItems.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+                    GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime
+                    GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
                 Catch ex As Exception
                     Try
-                        GridViewWFItems.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
-                        GridViewWFItems.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+                        GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
+                        GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
                     Catch ex1 As Exception
                         LOGGER.Warn("(ResetLayout)Column [Last edited] or [Zuletzt bearbeitet] not part of OverviewSQL")
                     End Try
@@ -657,14 +664,16 @@ Public Class frmMain
                 End Try
 
                 Try
-                    GridViewWFItems.Columns.Item("GROUP_TEXT").Visible = False
-                    GridViewWFItems.Columns.Item("GROUP_COLOR").Visible = False
+                    GridView_Docs.Columns.Item("GROUP_TEXT").Visible = False
+                    GridView_Docs.Columns.Item("GROUP_COLOR").Visible = False
 
                 Catch ex As Exception
 
                 End Try
                 Try
-                    GridViewWFItems.Columns.Item("ROW_COLOR").Visible = False
+                    If GridView_Docs.Columns.ColumnByFieldName("ROW_COLOR") IsNot Nothing Then
+                        GridView_Docs.Columns.Item("ROW_COLOR").Visible = False
+                    End If
                 Catch ex As Exception
 
                 End Try
@@ -781,10 +790,10 @@ Public Class frmMain
 
                         GRID_LOAD_TYPE = "PROFILE#" & _tag.ToString
                         TimerRefresh.Stop()
-                        GridViewWFItems.ShowLoadingPanel()
+                        GridView_Docs.ShowLoadingPanel()
                         DetailLinkActive = True
                         Await Load_single_Profile(True)
-                        GridViewWFItems.HideLoadingPanel()
+                        GridView_Docs.HideLoadingPanel()
                         TimerRefresh.Start()
                     Else
                         CURRENT_CLICKED_PROFILE_TITLE = Nothing
@@ -794,7 +803,7 @@ Public Class frmMain
             ElseIf _tag = "OVERVIEW" Then
                 OverviewOrDEtail = "OVERVIEW"
                 GRID_LOAD_TYPE = "OVERVIEW"
-                GridViewWFItems.ShowLoadingPanel()
+                GridView_Docs.ShowLoadingPanel()
                 TimerRefresh.Stop()
                 Dim oForce As Boolean = False
                 If DetailLinkActive = True Then
@@ -803,13 +812,13 @@ Public Class frmMain
                     OVERVIEW_ADDED_WHEN = ""
                 End If
                 Await Load_Grid_Overview(False, True, True)
-                GridViewWFItems.HideLoadingPanel()
+                GridView_Docs.HideLoadingPanel()
                 TimerRefresh.Start()
                 RefreshHelper.LoadViewInfo()
-                If GridViewWFItems.GroupCount = 0 And IsNothing(GridViewWFItems.Columns("GROUP_TEXT")) Then
+                If GridView_Docs.GroupCount = 0 And IsNothing(GridView_Docs.Columns("GROUP_TEXT")) Then
                     LOGGER.Info("NO GROUPS AFTER CLICK OVERVIEW...CREATING GROUPS NEW...")
                     Await Load_Grid_Overview(False, True, True)
-                    GridViewWFItems.HideLoadingPanel()
+                    GridView_Docs.HideLoadingPanel()
                     TimerRefresh.Start()
                     RefreshHelper.LoadViewInfo()
                 End If
@@ -890,7 +899,7 @@ Public Class frmMain
                         OVERVIEW_CHANGED_WHEN = oChanged
                         OVERVIEW_COUNT = oCOUNT
                     End If
-                    GridViewWFItems.ViewCaption = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE
+                    GridView_Docs.ViewCaption = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE
                     If CURR_DT_OVERVIEW.Rows.Count = 0 Then
                         NO_WORKFLOWITEMS = True
                     Else
@@ -899,7 +908,7 @@ Public Class frmMain
                     Create_Basic_View()
 
                     RestoreLayout()
-                    GridViewWFItems.ViewCaption = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE
+                    GridView_Docs.ViewCaption = "Detailansicht Profil: " & CURRENT_CLICKED_PROFILE_TITLE
                 End If
 
             End If
@@ -915,7 +924,7 @@ Public Class frmMain
             FRONTEND_ACTION = "Create_Basic_View"
             GridControl_Docs.DataSource = Nothing
             Try
-                GridViewWFItems.Columns.Clear()
+                GridView_Docs.Columns.Clear()
             Catch ex As Exception
                 LOGGER.Error(ex)
                 LOGGER.Warn("Could not clear GridView_Docs.Columns")
@@ -979,7 +988,7 @@ Public Class frmMain
             Next
             bindsourcegrid.DataSource = CURR_DT_OVERVIEW
             GridControl_Docs.DataSource = bindsourcegrid
-            Dim objectCount_Descr = GridViewWFItems.RowCount.ToString
+            Dim objectCount_Descr = GridView_Docs.RowCount.ToString
             If USER_LANGUAGE = "de-DE" Then
                 objectCount_Descr &= " Vorgänge"
             Else
@@ -993,24 +1002,24 @@ Public Class frmMain
             RestoreLayout()
 
 
-            GridViewWFItems.Columns.Item("PROFILE_ID").Visible = False
-            GridViewWFItems.Columns.Item("GUID").Visible = False
+            GridView_Docs.Columns.Item("PROFILE_ID").Visible = False
+            GridView_Docs.Columns.Item("GUID").Visible = False
             Try
-                GridViewWFItems.Columns.Item(FullFilepatColName).Visible = False
+                GridView_Docs.Columns.Item(FullFilepatColName).Visible = False
             Catch ex As Exception
             End Try
             Try
                 'GridView_Docs.Columns.Item("DocID").Visible = False
-                GridViewWFItems.Columns.Item("TL_STATE").Visible = False
+                GridView_Docs.Columns.Item("TL_STATE").Visible = False
             Catch ex As Exception
 
             End Try
             Try
                 If TL_ICON = True Then
-                    GridViewWFItems.Columns.Item("ICON").MaxWidth = 24
-                    GridViewWFItems.Columns.Item("ICON").MinWidth = 24
-                    GridViewWFItems.Columns.Item("ICON").AppearanceCell.BackColor = Color.White
-                    GridViewWFItems.Columns.Item("ICON").Fixed = FixedStyle.Left
+                    GridView_Docs.Columns.Item("ICON").MaxWidth = 24
+                    GridView_Docs.Columns.Item("ICON").MinWidth = 24
+                    GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White
+                    GridView_Docs.Columns.Item("ICON").Fixed = FixedStyle.Left
                 End If
             Catch ex As Exception
 
@@ -1018,15 +1027,15 @@ Public Class frmMain
 
 
             Try
-                GridViewWFItems.Columns.Item("CONV_YN").Visible = False
+                GridView_Docs.Columns.Item("CONV_YN").Visible = False
             Catch ex As Exception
                 LOGGER.Info("Create_Basic_View - Check wether Column CONV_YN is part of select/view")
             End Try
             If IDB_ACTIVE = True Then
                 Try
-                    GridViewWFItems.Columns.Item("CONVERSATION").MaxWidth = 24
-                    GridViewWFItems.Columns.Item("CONVERSATION").MinWidth = 24
-                    GridViewWFItems.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left
+                    GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24
+                    GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24
+                    GridView_Docs.Columns.Item("CONVERSATION").Fixed = FixedStyle.Left
                 Catch ex As Exception
                     LOGGER.Info("Create_Basic_View2 - Column CONVERSATION obviously is not part of GridView_Docs - Trying to Rest Layout")
                     ResetLayout()
@@ -1040,12 +1049,12 @@ Public Class frmMain
             Try
                 Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "")
                 oReducedColName = oReducedColName.Replace("]", "")
-                GridViewWFItems.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime
-                GridViewWFItems.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+                GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime
+                GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
             Catch ex As Exception
                 Try
-                    GridViewWFItems.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
-                    GridViewWFItems.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+                    GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
+                    GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
                 Catch ex1 As Exception
                     LOGGER.Warn("(CreateBasicView)Column [Last edited] or [Zuletzt bearbeitet] not part of OverviewSQL")
                 End Try
@@ -1054,8 +1063,8 @@ Public Class frmMain
 
             LOGGER.Debug("All columns in CreateBasicView created")
             Try
-                GridViewWFItems.Columns.Item("GROUP_TEXT").Visible = False
-                GridViewWFItems.Columns.Item("GROUP_COLOR").Visible = False
+                GridView_Docs.Columns.Item("GROUP_TEXT").Visible = False
+                GridView_Docs.Columns.Item("GROUP_COLOR").Visible = False
             Catch ex As Exception
                 If OverviewOrDEtail = "OVERVIEW" Then
                     LOGGER.Warn("ATTENTION: GROUP COLUMNS NOT PART OF GRID")
@@ -1077,7 +1086,7 @@ Public Class frmMain
                     Continue For
                 End If
                 Dim oViewColumn_exists As Boolean = False
-                For Each oActGridColumn As GridColumn In GridViewWFItems.Columns
+                For Each oActGridColumn As GridColumn In GridView_Docs.Columns
                     Dim oGridDXFieldName = oActGridColumn.FieldName
                     Dim GridDXColumnEditName = oActGridColumn.ColumnEditName
                     Dim GridDXFieldName = oActGridColumn.FieldName
@@ -1101,7 +1110,7 @@ Public Class frmMain
                     End If
                 End If
             Next
-            For Each oActGridColumn As GridColumn In GridViewWFItems.Columns
+            For Each oActGridColumn As GridColumn In GridView_Docs.Columns
                 If oActGridColumn.Caption = "" Then
                     Continue For
                 End If
@@ -1237,7 +1246,7 @@ Public Class frmMain
                 TimerRefresh.Enabled = False
             End If
 
-            GridViewWFItems.ShowLoadingPanel()
+            GridView_Docs.ShowLoadingPanel()
             TimerRefresh.Stop()
             FRONTEND_ACTION = "DECIDE_LOAD"
             If GRID_LOAD_TYPE = "OVERVIEW" Then
@@ -1247,23 +1256,23 @@ Public Class frmMain
                 Await Load_single_Profile(ForceReload)
             End If
             FRONTEND_ACTION = FA_NONE
-            GridViewWFItems.HideLoadingPanel()
+            GridView_Docs.HideLoadingPanel()
             TimerRefresh.Start()
 
             If SHOW_MASS_VALIDATOR = False Then
-                GridViewWFItems.OptionsSelection.MultiSelect = False
-                GridViewWFItems.OptionsSelection.MultiSelectMode = GridMultiSelectMode.RowSelect
+                GridView_Docs.OptionsSelection.MultiSelect = False
+                GridView_Docs.OptionsSelection.MultiSelectMode = GridMultiSelectMode.RowSelect
                 BarButtonItemMassValidation.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
             Else
                 BarButtonItemMassValidation.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
 
-                GridViewWFItems.OptionsSelection.MultiSelect = True
-                GridViewWFItems.OptionsSelection.MultiSelectMode = GridMultiSelectMode.CheckBoxRowSelect
+                GridView_Docs.OptionsSelection.MultiSelect = True
+                GridView_Docs.OptionsSelection.MultiSelectMode = GridMultiSelectMode.CheckBoxRowSelect
             End If
-            If GridViewWFItems.OptionsView.ShowAutoFilterRow = True Then
+            If GridView_Docs.OptionsView.ShowAutoFilterRow = True Then
                 BarCheckItemAutofilter.Checked = True
             End If
-            If GridViewWFItems.OptionsFind.AlwaysVisible Then
+            If GridView_Docs.OptionsFind.AlwaysVisible Then
                 BarCheckItemShowSearch.Checked = True
             End If
             GridIsLoaded = True
@@ -1450,7 +1459,7 @@ Public Class frmMain
                 bsiMessage.ItemAppearance.Normal.BackColor = Color.Red
                 Exit Sub
             End If
-            Dim hitInfo As GridHitInfo = GridViewWFItems.CalcHitInfo(GridCursorLocation)
+            Dim hitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation)
             bsiMessage.Caption = ""
             bsiMessage.ItemAppearance.Normal.BackColor = Color.Transparent
             Dim OItemScopeInfo = "No Item so far"
@@ -1463,9 +1472,9 @@ Public Class frmMain
             End If
             Dim oHitProfilID
             If hitInfo.InGroupRow Then
-                oHitProfilID = GridViewWFItems.GetRowCellValue(GridViewWFItems.GetDataRowHandleByGroupRowHandle(hitInfo.RowHandle), GridViewWFItems.Columns("PROFILE_ID"))
+                oHitProfilID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hitInfo.RowHandle), GridView_Docs.Columns("PROFILE_ID"))
             ElseIf hitInfo.InDataRow Then
-                oHitProfilID = GridViewWFItems.GetRowCellValue(GridViewWFItems.GetDataRowHandleByGroupRowHandle(GridViewWFItems.GetParentRowHandle(hitInfo.RowHandle)), GridViewWFItems.Columns("PROFILE_ID"))
+                oHitProfilID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(GridView_Docs.GetParentRowHandle(hitInfo.RowHandle)), GridView_Docs.Columns("PROFILE_ID"))
             End If
             If Len(oHitProfilID) > 0 Then
                 If oHitProfilID > 0 Then
@@ -1481,21 +1490,21 @@ Public Class frmMain
                 Dim oIds As New List(Of Integer)
                 Dim oCount As Integer = 0
                 '-----------------------------
-                Dim orows() As Integer = GridViewWFItems.GetSelectedRows
+                Dim orows() As Integer = GridView_Docs.GetSelectedRows
                 Dim i As Integer
                 For i = 0 To orows.Length - 1 Step i + 1
-                    Dim childRowCount As Integer = GridViewWFItems.GetChildRowCount(orows(i))
+                    Dim childRowCount As Integer = GridView_Docs.GetChildRowCount(orows(i))
                     Dim j As Integer
                     Dim childRowIndex As Integer
                     For j = 0 To childRowCount - 1 Step j + 1
-                        childRowIndex = GridViewWFItems.GetChildRowHandle(orows(i), j)
-                        Dim oRow = GridViewWFItems.GetRow(childRowIndex)
+                        childRowIndex = GridView_Docs.GetChildRowHandle(orows(i), j)
+                        Dim oRow = GridView_Docs.GetRow(childRowIndex)
                         oIds.Add(oRow.item("DocId"))
                     Next
                 Next
                 If oIds.Count = 0 Then
-                    For index = 0 To GridViewWFItems.RowCount
-                        Dim oRow = GridViewWFItems.GetRow(index)
+                    For index = 0 To GridView_Docs.RowCount
+                        Dim oRow = GridView_Docs.GetRow(index)
 
                         If oRow Is Nothing Then
                             Continue For
@@ -1542,14 +1551,14 @@ Public Class frmMain
                 bsiMessage.ItemAppearance.Normal.BackColor = Color.Red
                 Exit Sub
             End If
-            Dim groupRowText
+            Dim groupRowText = ""
 
             If hitInfo.InGroupRow Then
                 GridViewItem_Clicked = "GROUP"
                 startedFrom = "CMGROUP"
                 LOGGER.Debug($"Item_Scope: InGroupRow")
                 OItemScopeInfo = "InGroupRow"
-                groupRowText = GridViewWFItems.GetGroupRowDisplayText(hitInfo.RowHandle)
+                groupRowText = GridView_Docs.GetGroupRowDisplayText(hitInfo.RowHandle)
                 OItemScopeInfo = $"groupRowText {groupRowText}"
                 LOGGER.Debug($"Item_Scope: groupRowText {groupRowText}")
                 ' oHitProfilID = GridViewWFItems.GetRowCellValue(GridViewWFItems.GetDataRowHandleByGroupRowHandle(hitInfo.RowHandle), GridViewWFItems.Columns("PROFILE_ID"))
@@ -1560,7 +1569,7 @@ Public Class frmMain
                 If GRID_LOAD_TYPE = "OVERVIEW" Then
                     OItemScopeInfo = $"GRID_LOAD_TYPE = OVERVIEW"
                     LOGGER.Debug($"Item_Scope: GRID_LOAD_TYPE = OVERVIEW")
-                    groupRowText = GridViewWFItems.GetGroupRowDisplayText(GridViewWFItems.GetParentRowHandle(hitInfo.RowHandle))
+                    groupRowText = GridView_Docs.GetGroupRowDisplayText(GridView_Docs.GetParentRowHandle(hitInfo.RowHandle))
                     OItemScopeInfo = $"OVERVIEWgroupRowText {groupRowText}"
                     LOGGER.Debug($"Item_Scope: OVERVIEWgroupRowText {groupRowText}")
                     ' oHitProfilID = GridViewWFItems.GetRowCellValue(GridViewWFItems.GetDataRowHandleByGroupRowHandle(GridViewWFItems.GetParentRowHandle(hitInfo.RowHandle)), GridViewWFItems.Columns("PROFILE_ID"))
@@ -1586,14 +1595,14 @@ Public Class frmMain
             Dim PROFIL_TITLE
             If GRID_LOAD_TYPE = "OVERVIEW" Then
                 Try
-                    groupRowText = LTrim(RTrim(groupRowText.ToString.Replace("GROUP_TEXT: ", "")))
+                    groupRowText = groupRowText.ToString.Replace("Profile (Fixed): ", "").Trim()
                 Catch ex As Exception
 
                 End Try
 
                 Dim _SPLIT As String()
                 _SPLIT = groupRowText.Split("|")
-                PROFIL_TITLE = LTrim(RTrim(_SPLIT(0).ToString))
+                PROFIL_TITLE = _SPLIT(0).ToString.Trim()
             Else
 
             End If
@@ -1616,14 +1625,14 @@ Public Class frmMain
                     LOGGER.Debug($"Item_Scope: hitInfo.InDataRow...")
                     Dim oFocusedDocGUID
                     Try
-                        oFocusedDocGUID = GridViewWFItems.GetFocusedRowCellValue(GridViewWFItems.Columns("GUID"))
+                        oFocusedDocGUID = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("GUID"))
                     Catch ex As Exception
                         FormHelper.ShowInfoMessage("Could not get DocGUID. Inform Your admin-team: Check Your View-Config", omsgTitleWarning)
 
                     End Try
                     Dim oFocusedDocID
                     Try
-                        oFocusedDocID = GridViewWFItems.GetFocusedRowCellValue(GridViewWFItems.Columns("DocID"))
+                        oFocusedDocID = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("DocID"))
                     Catch ex As Exception
                         FormHelper.ShowInfoMessage("Could not get DocID. Inform Your admin-team: Check Your View-Config", omsgTitleWarning)
                     End Try
@@ -1641,8 +1650,8 @@ Public Class frmMain
                         Exit Sub
                     End If
                     LOGGER.Debug($"Item_Scope: GotDocID {oFocusedDocID} and DocGUID {oFocusedDocGUID}")
-                    If Not IsNothing(GridViewWFItems.Columns(FullFilepatColName)) Then
-                        Dim DOC_PATH = GridViewWFItems.GetFocusedRowCellValue(GridViewWFItems.Columns(FullFilepatColName))
+                    If Not IsNothing(GridView_Docs.Columns(FullFilepatColName)) Then
+                        Dim DOC_PATH = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns(FullFilepatColName))
                         If IsNothing(DOC_PATH) Then
                             LOGGER.Warn("In hitInfo.InDataRow: FULL_FILE_PATH is nothing!!!")
                             Exit Sub
@@ -1742,13 +1751,25 @@ Public Class frmMain
     Private Sub Create_Groups()
         Try
             LOGGER.Debug("Now Working on Groups..")
-            GridViewWFItems.OptionsView.ShowGroupPanel = False
+            GridView_Docs.OptionsView.ShowGroupPanel = False
             Dim oindex As Integer = 0
             If Not IsNothing(BASEDATA_DTGRID_GROUPS) Then
                 For Each oGridGroup As DataRow In BASEDATA_DTGRID_GROUPS.Rows
-                    LOGGER.Debug($"Adding group [{oGridGroup.Item("GROUPNAME")}] for Grid...")
+
+                    Dim oGroupName = oGridGroup.Item("GROUPNAME")
+
+                    LOGGER.Debug($"Adding group [{oGroupName}] for Grid...")
                     Try
-                        GridViewWFItems.Columns.Item(oGridGroup.Item("GROUPNAME")).GroupIndex = oindex
+                        Dim oGroupColumn As GridColumn = GridView_Docs.Columns.Item(oGroupName)
+
+                        If oGroupColumn IsNot Nothing Then
+                            oGroupColumn.GroupIndex = oindex
+                            oGroupColumn.Group()
+                            oGroupColumn.OptionsColumn.AllowGroup = DefaultBoolean.False
+                            oGroupColumn.OptionsColumn.AllowMove = False
+                            oGroupColumn.OptionsColumn.AllowShowHide = False
+                            oGroupColumn.Caption = "Profile (Fixed)"
+                        End If
                     Catch ex As Exception
 
                     End Try
@@ -1758,17 +1779,17 @@ Public Class frmMain
             End If
 
             Try
-                GridViewWFItems.Columns.Item("GROUP_TEXT").Visible = False
-                GridViewWFItems.Columns.Item("GROUP_COLOR").Visible = False
+                GridView_Docs.Columns.Item("GROUP_TEXT").Visible = False
+                GridView_Docs.Columns.Item("GROUP_COLOR").Visible = False
             Catch ex As Exception
             End Try
-            For index = 0 To GridViewWFItems.GroupCount - 1
+            For index = 0 To GridView_Docs.GroupCount - 1
                 'Dim v = GridView_Docs.GroupedColumns(index).ToString
-                LOGGER.Debug($"Adding tag [{GridViewWFItems.Columns.Item("PROFILE_ID")}] for group...")
-                Dim sd = GridViewWFItems.GroupedColumns(index).GetTextCaption
-                GridViewWFItems.GroupedColumns(index).Tag = GridViewWFItems.Columns.Item("PROFILE_ID")
+                LOGGER.Debug($"Adding tag [{GridView_Docs.Columns.Item("PROFILE_ID")}] for group...")
+                Dim sd = GridView_Docs.GroupedColumns(index).GetTextCaption
+                GridView_Docs.GroupedColumns(index).Tag = GridView_Docs.Columns.Item("PROFILE_ID")
             Next
-            GridViewWFItems.CollapseAllGroups()
+            GridView_Docs.CollapseAllGroups()
             LOGGER.Debug("finished Grouping!")
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -1815,7 +1836,7 @@ Public Class frmMain
                 bindsourcegrid.DataSource = Nothing
                 GridControl_Docs.DataSource = Nothing
                 Try
-                    GridViewWFItems.Columns.Clear()
+                    GridView_Docs.Columns.Clear()
                 Catch ex As Exception
                     LOGGER.Error(ex)
 
@@ -1863,16 +1884,16 @@ Public Class frmMain
                 NO_WORKFLOWITEMS = False
                 If CURR_DT_OVERVIEW.Rows.Count = 0 Then
                     If USER_LANGUAGE = "de-DE" Then
-                        GridViewWFItems.ViewCaption = "Aktuell keine Workflowdaten vorhanden!"
+                        GridView_Docs.ViewCaption = "Aktuell keine Workflowdaten vorhanden!"
                     Else
-                        GridViewWFItems.ViewCaption = "No workflowdata!"
+                        GridView_Docs.ViewCaption = "No workflowdata!"
                     End If
                     NO_WORKFLOWITEMS = True
                     GridControl_Docs.Visible = False
                     bindsourcegrid.DataSource = Nothing
                     GridControl_Docs.DataSource = Nothing
                     Try
-                        GridViewWFItems.Columns.Clear()
+                        GridView_Docs.Columns.Clear()
                     Catch ex As Exception
                         LOGGER.Error(ex)
                     End Try
@@ -1940,6 +1961,7 @@ Public Class frmMain
 
                 bindsourcegrid.DataSource = CURR_DT_OVERVIEW
                 GridControl_Docs.DataSource = bindsourcegrid
+                GridControl_Docs.ForceInitialize()
 
                 Create_View_Caption()
 
@@ -1968,12 +1990,12 @@ Public Class frmMain
 
                 Try
                     Create_Groups()
-                    GridViewWFItems.Columns.Item("PROFILE_ID").Visible = False
-                    GridViewWFItems.Columns.Item("GUID").Visible = False
+                    GridView_Docs.Columns.Item("PROFILE_ID").Visible = False
+                    GridView_Docs.Columns.Item("GUID").Visible = False
                     Try
-                        GridViewWFItems.Columns.Item(FullFilepatColName).Visible = False
+                        GridView_Docs.Columns.Item(FullFilepatColName).Visible = False
                         'GridView_Docs.Columns.Item("DocID").Visible = False
-                        GridViewWFItems.Columns.Item("TL_STATE").Visible = False
+                        GridView_Docs.Columns.Item("TL_STATE").Visible = False
                     Catch ex As Exception
 
                     End Try
@@ -1981,10 +2003,10 @@ Public Class frmMain
 
                     If TL_ICON = True Then
                         Try
-                            GridViewWFItems.Columns.Item("ICON").MaxWidth = 24
-                            GridViewWFItems.Columns.Item("ICON").MinWidth = 24
-                            GridViewWFItems.Columns.Item("ICON").AppearanceCell.BackColor = Color.White
-                            GridViewWFItems.Columns.Item("ICON").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left
+                            GridView_Docs.Columns.Item("ICON").MaxWidth = 24
+                            GridView_Docs.Columns.Item("ICON").MinWidth = 24
+                            GridView_Docs.Columns.Item("ICON").AppearanceCell.BackColor = Color.White
+                            GridView_Docs.Columns.Item("ICON").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left
                         Catch ex As Exception
 
                         End Try
@@ -1992,8 +2014,8 @@ Public Class frmMain
                     End If
 
                     Try
-                        If GridViewWFItems.Columns.Item("CONV_YN") IsNot Nothing Then
-                            GridViewWFItems.Columns.Item("CONV_YN").Visible = False
+                        If GridView_Docs.Columns.Item("CONV_YN") IsNot Nothing Then
+                            GridView_Docs.Columns.Item("CONV_YN").Visible = False
 
                         End If
                     Catch ex As Exception
@@ -2001,9 +2023,9 @@ Public Class frmMain
                     End Try
                     If IDB_ACTIVE = True Then
                         Try
-                            GridViewWFItems.Columns.Item("CONVERSATION").MaxWidth = 24
-                            GridViewWFItems.Columns.Item("CONVERSATION").MinWidth = 24
-                            GridViewWFItems.Columns.Item("CONVERSATION").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left
+                            GridView_Docs.Columns.Item("CONVERSATION").MaxWidth = 24
+                            GridView_Docs.Columns.Item("CONVERSATION").MinWidth = 24
+                            GridView_Docs.Columns.Item("CONVERSATION").Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Left
                         Catch ex As Exception
                             LOGGER.Info("LoadGridOverview - Column CONVERSATION obviously not part of GridView_Docs")
                         End Try
@@ -2015,12 +2037,12 @@ Public Class frmMain
                     Try
                         Dim oReducedColName = LAST_EDITED_COLUMN.Replace("[", "")
                         oReducedColName = oReducedColName.Replace("]", "")
-                        GridViewWFItems.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime
-                        GridViewWFItems.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+                        GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatType = FormatType.DateTime
+                        GridView_Docs.Columns(oReducedColName).DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
                     Catch ex As Exception
                         Try
-                            GridViewWFItems.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
-                            GridViewWFItems.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
+                            GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatType = FormatType.DateTime
+                            GridView_Docs.Columns("Zuletzt bearbeitet").DisplayFormat.FormatString = "dd.MM.yyyy HH:MM:ss"
                         Catch ex1 As Exception
                             LOGGER.Warn("(Warning LoadGridOverview)Column [Last edited] or [Zuletzt bearbeitet] not part of OverviewSQL")
                         End Try
@@ -2032,7 +2054,7 @@ Public Class frmMain
                     LOGGER.Error(ex)
                     LOGGER.Info("Unexpected Error in Formatting Grid: " & ex.Message)
                 End Try
-                If GridViewWFItems.Columns.Count <= 5 Then
+                If GridView_Docs.Columns.Count <= 5 Then
                     LOGGER.Info("GridView_Docs.Columns.Count <= 2 - Reset_Gridlayout will be forced...", False)
                     Await Reset_GridLayout(pFormLoad)
                 End If
@@ -2046,7 +2068,7 @@ Public Class frmMain
 
 
                 Try
-                    GridViewWFItems.Columns.Clear()
+                    GridView_Docs.Columns.Clear()
                 Catch ex As Exception
                     LOGGER.Error(ex)
                 End Try
@@ -2065,9 +2087,7 @@ Public Class frmMain
         End If
     End Sub
 
-
-
-    Private Async Sub GridLayout_Reset()
+    Private Async Function GridLayout_Reset() As Tasks.Task
         FRONTEND_ACTION = "RESET_LAYOUT"
         Await Reset_GridLayout(False)
         Await Decide_Load(False, True)
@@ -2075,7 +2095,8 @@ Public Class frmMain
         GridBuilder.WithFontSizeDelta(CONFIG.Config.GridFontSizeDelta)
         If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo()
         FRONTEND_ACTION = FA_NONE
-    End Sub
+    End Function
+
     Async Function Reset_GridLayout(FormLoad As Boolean) As Tasks.Task
 
         If GridControl_Docs.Visible = True And FormOpenClose = False Then
@@ -2092,11 +2113,11 @@ Public Class frmMain
         InResetlayout = False
     End Function
 
-    Private Sub GridView_Docs_DoubleClick(sender As Object, e As EventArgs) Handles GridViewWFItems.DoubleClick
+    Private Sub GridView_Docs_DoubleClick(sender As Object, e As EventArgs) Handles GridView_Docs.DoubleClick
         Item_Scope("DOUBLECLICK")
     End Sub
 
-    Private Sub GridView_Docs_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridViewWFItems.CustomDrawGroupRow
+    Private Sub GridView_Docs_CustomDrawGroupRow(sender As Object, e As Views.Base.RowObjectCustomDrawEventArgs) Handles GridView_Docs.CustomDrawGroupRow
         Try
             ' Added
             If FormOpenClose = True And GridIsLoaded = False Then
@@ -2172,7 +2193,7 @@ Public Class frmMain
     End Function
 
 
-    Private Sub GridView_Docs_MouseDown(sender As Object, e As MouseEventArgs) Handles GridViewWFItems.MouseDown
+    Private Sub GridView_Docs_MouseDown(sender As Object, e As MouseEventArgs) Handles GridView_Docs.MouseDown
         Dim view As GridView = sender
         Dim hi As GridHitInfo = view.CalcHitInfo(e.Location)
         Dim groupRowButtonClicked = (hi.HitTest = GridHitTest.RowGroupButton)
@@ -2185,13 +2206,13 @@ Public Class frmMain
             DXMouseEventArgs.GetMouseArgs(e).Handled = True
             GridViewItem_Clicked = "GROUP"
             If Not Application.OpenForms().OfType(Of frmValidator).Any Then
-                CURRENT_CLICKED_PROFILE_ID = GridViewWFItems.GetRowCellValue(GridViewWFItems.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridViewWFItems.Columns("PROFILE_ID"))
+                CURRENT_CLICKED_PROFILE_ID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridView_Docs.Columns("PROFILE_ID"))
             End If
 
         ElseIf hi.InDataRow Then
             GridViewItem_Clicked = "ROW"
             If Not Application.OpenForms().OfType(Of frmValidator).Any Then
-                CURRENT_CLICKED_PROFILE_ID = GridViewWFItems.GetRowCellValue(GridViewWFItems.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridViewWFItems.Columns("PROFILE_ID"))
+                CURRENT_CLICKED_PROFILE_ID = GridView_Docs.GetRowCellValue(GridView_Docs.GetDataRowHandleByGroupRowHandle(hi.RowHandle), GridView_Docs.Columns("PROFILE_ID"))
             End If
 
         Else
@@ -2219,14 +2240,14 @@ Public Class frmMain
 
     End Sub
 
-    Private Sub GridView_Docs_ColumnWidthChanged(sender As Object, e As Views.Base.ColumnEventArgs) Handles GridViewWFItems.ColumnWidthChanged
+    Private Sub GridView_Docs_ColumnWidthChanged(sender As Object, e As Views.Base.ColumnEventArgs) Handles GridView_Docs.ColumnWidthChanged
         GridLayout_Changed("ColumnWidthChanged")
     End Sub
-    Private Sub GridView_Docs_EndSorting(sender As Object, e As EventArgs) Handles GridViewWFItems.EndSorting
+    Private Sub GridView_Docs_EndSorting(sender As Object, e As EventArgs) Handles GridView_Docs.EndSorting
         GridLayout_Changed("EndSorting")
     End Sub
 
-    Private Sub GridView_Docs_LostFocus(sender As Object, e As EventArgs) Handles GridViewWFItems.LostFocus
+    Private Sub GridView_Docs_LostFocus(sender As Object, e As EventArgs) Handles GridView_Docs.LostFocus
         ' Save expanded GroupRows
         If GridControl_Docs.Visible = True And FormOpenClose = False Then
             RefreshHelper.SaveViewInfo()
@@ -2304,24 +2325,22 @@ Public Class frmMain
         oStopWatch.Done()
     End Sub
     Private Async Sub frmMain_Shown(sender As Object, e As EventArgs) Handles Me.Shown
-        If RIBBON_COLOR_SCHEME = "BLUE" Then
-            RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Blue
-        ElseIf RIBBON_COLOR_SCHEME = "DarkBlue".ToUpper Then
-            RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.DarkBlue
-        ElseIf RIBBON_COLOR_SCHEME = "Green".ToUpper Then
-            RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
-        ElseIf RIBBON_COLOR_SCHEME = "Orange".ToUpper Then
-            RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Orange
-        ElseIf RIBBON_COLOR_SCHEME = "Purple".ToUpper Then
-            RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Purple
-        ElseIf RIBBON_COLOR_SCHEME = "Red".ToUpper Then
-            RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Red
-        ElseIf RIBBON_COLOR_SCHEME = "Teal".ToUpper Then
-            RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Teal
-        Else
-            RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Default
+        If RIBBON_COLOR_SCHEME <> "" Then
+            Me.LookAndFeel.UseDefaultLookAndFeel = False
+            If RIBBON_COLOR_SCHEME = "Blue".ToUpper Then
+                LookAndFeel.SetSkinStyle(SkinStyle.Office2019White, SkinSvgPalette.Office2019White.Yale)
+            ElseIf RIBBON_COLOR_SCHEME = "Green".ToUpper Then
+                LookAndFeel.SetSkinStyle(SkinStyle.Office2019White, SkinSvgPalette.Office2019White.Pine)
+            ElseIf RIBBON_COLOR_SCHEME = "Purple".ToUpper Then
+                LookAndFeel.SetSkinStyle(SkinStyle.Office2019White, SkinSvgPalette.Office2019White.Plum)
+            ElseIf RIBBON_COLOR_SCHEME = "Red".ToUpper Then
+                LookAndFeel.SetSkinStyle(SkinStyle.Office2019White, SkinSvgPalette.Office2019White.FireBrick)
+            Else
+                RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Default
+            End If
+            LOGGER.Debug($" RibbonControl1.ColorScheme [{RIBBON_COLOR_SCHEME}]")
         End If
-        LOGGER.Debug($" RibbonControl1.ColorScheme [{RIBBON_COLOR_SCHEME}]")
+
         Me.Text = ADDITIONAL_TITLE
         CurrNavBarGroup = NavBarControl1.Groups(1)
 
@@ -2330,6 +2349,19 @@ Public Class frmMain
         Await Decide_Load(True)
         Handling_DEBUG_USER()
 
+        Dim oSQL = $"SELECT * FROM TBDD_NOTIFICATIONS_SYSTEM 
+            where DISPLAY_UNTIL <= CONVERT(DATE,GETDATE()) or DISPLAY_UNTIL IS NULL AND MODULE = 'PM' 
+            AND GUID NOT IN (SELECT NOTIFY_ID FROM TBDD_NOTIFICATIONS_USER_HISTORY WHERE USR_ID = {USER_ID})"
+        Dim oDT As DataTable = DatabaseFallback.GetDatatable("TBDD_NOTIFICATIONS_SYSTEM", New GetDatatableOptions(oSQL, DatabaseType.ECM))
+        If Not IsNothing(oDT) Then
+            If oDT.Rows.Count > 0 Then
+                Dim oEnvironment = GetEnvironment()
+                Dim oNForm As New frmNotification_Startup(oDT, LOGCONFIG, GDPICTURE_LICENSE, TITLE_NOTIFICATIONS, oEnvironment)
+                oNForm.ShowDialog()
+            End If
+
+        End If
+
     End Sub
     Sub Handling_DEBUG_USER()
         If DEBUG = True Then
@@ -2376,8 +2408,8 @@ Public Class frmMain
         Timer_Inactivity_Reset_Disable("LöscheAlleFilterToolStripMenuItem")
 
         Try
-            GridViewWFItems.ClearFindFilter()
-            GridViewWFItems.ClearColumnsFilter()
+            GridView_Docs.ClearFindFilter()
+            GridView_Docs.ClearColumnsFilter()
             SaveGridLayout()
         Catch ex As Exception
 
@@ -2548,7 +2580,7 @@ Public Class frmMain
         BringMonitor2Front()
     End Sub
 
-    Private Sub GridView_Docs_RowStyle(sender As Object, e As RowStyleEventArgs) Handles GridViewWFItems.RowStyle
+    Private Sub GridView_Docs_RowStyle(sender As Object, e As RowStyleEventArgs) Handles GridView_Docs.RowStyle
         If FormShown = False Then
             Exit Sub
         End If
@@ -2562,7 +2594,7 @@ Public Class frmMain
         Else
             IsFilterMode = False
             Try
-                Dim oRowColorCellValue = GridViewWFItems.GetRowCellValue(e.RowHandle, "ROW_COLOR")
+                Dim oRowColorCellValue = GridView_Docs.GetRowCellValue(e.RowHandle, "ROW_COLOR")
                 If Not IsNothing(oRowColorCellValue) Then
                     Dim oColor As Color
                     Try
@@ -2636,7 +2668,7 @@ Public Class frmMain
         If GridControl_Docs.Visible = True And FormOpenClose = False Then RefreshHelper.LoadViewInfo()
     End Sub
 
-    Private Sub GridView_Docs_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridViewWFItems.ColumnFilterChanged
+    Private Sub GridView_Docs_ColumnFilterChanged(sender As Object, e As EventArgs) Handles GridView_Docs.ColumnFilterChanged
         Try
             If FormShown = False Then
                 Exit Sub
@@ -2651,15 +2683,15 @@ Public Class frmMain
                 Else
                     objectCount_Descr = " Filter aktiv"
                 End If
-                GridViewWFItems.ViewCaption += $"|{objectCount_Descr}"
+                GridView_Docs.ViewCaption += $"|{objectCount_Descr}"
             Else
                 Ev_Filter_Panel_Closed = False
             End If
-            If GridViewWFItems.ActiveFilterEnabled Then
+            If GridView_Docs.ActiveFilterEnabled Then
 
             End If
             GridLayout_Changed("ColumnFilterChanged")
-            RowCount
+            RowCount()
         Catch ex As Exception
             LOGGER.Error(ex.Message)
         End Try
@@ -2677,7 +2709,7 @@ Public Class frmMain
             '    End If
 
             'Next
-            Dim oRowCount = GridViewWFItems.RowCount
+            Dim oRowCount = GridView_Docs.RowCount
 
             oRowCount = oRowCount '- oGroupCount
             Dim objectCount_Descr = $"[{oRowCount.ToString}]"
@@ -2696,9 +2728,9 @@ Public Class frmMain
         Try
 
             If USER_LANGUAGE = "de-DE" Then
-                GridViewWFItems.ViewCaption = "Gesamtübersicht"
+                GridView_Docs.ViewCaption = "Gesamtübersicht"
             Else
-                GridViewWFItems.ViewCaption = "Overview"
+                GridView_Docs.ViewCaption = "Overview"
             End If
 
         Catch ex As Exception
@@ -2713,7 +2745,7 @@ Public Class frmMain
             Dim oOptions As New XlsxExportOptions() With {
                     .ExportMode = XlsxExportMode.SingleFile
                 }
-            GridViewWFItems.ExportToXlsx(XtraSaveFileDialog1.FileName, oOptions)
+            GridView_Docs.ExportToXlsx(XtraSaveFileDialog1.FileName, oOptions)
         End If
     End Sub
 
@@ -2804,7 +2836,7 @@ Public Class frmMain
         End Try
     End Sub
 
-    Private Sub GridView_Docs_ColumnPositionChanged(sender As Object, e As EventArgs) Handles GridViewWFItems.ColumnPositionChanged
+    Private Sub GridView_Docs_ColumnPositionChanged(sender As Object, e As EventArgs) Handles GridView_Docs.ColumnPositionChanged
         GridLayout_Changed("ColumnPositionChanged")
     End Sub
     Private Sub GridLayout_Changed(oEvent As String)
@@ -2818,7 +2850,7 @@ Public Class frmMain
     End Sub
 
 
-    Private Sub GridView_Docs_EndGrouping(sender As Object, e As EventArgs) Handles GridViewWFItems.EndGrouping
+    Private Sub GridView_Docs_EndGrouping(sender As Object, e As EventArgs) Handles GridView_Docs.EndGrouping
         GridLayout_Changed("EndGrouping")
     End Sub
 
@@ -2826,7 +2858,7 @@ Public Class frmMain
 
     End Sub
 
-    Private Sub GridView_Docs_KeyDown(sender As Object, e As KeyEventArgs) Handles GridViewWFItems.KeyDown
+    Private Sub GridView_Docs_KeyDown(sender As Object, e As KeyEventArgs) Handles GridView_Docs.KeyDown
         Dim view As GridView = CType(sender, GridView)
         If e.Control AndAlso e.KeyCode = Keys.C Then
             If view.GetRowCellValue(view.FocusedRowHandle, view.FocusedColumn) IsNot Nothing AndAlso view.GetRowCellValue(view.FocusedRowHandle, view.FocusedColumn).ToString() <> [String].Empty Then
@@ -2838,13 +2870,13 @@ Public Class frmMain
 
     Private Sub BarCheckItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarCheckItemAutofilter.CheckedChanged
         If GridIsLoaded = True Then
-            GridViewWFItems.OptionsView.ShowAutoFilterRow = BarCheckItemAutofilter.Checked
+            GridView_Docs.OptionsView.ShowAutoFilterRow = BarCheckItemAutofilter.Checked
         End If
 
     End Sub
     Private Sub BarCheckItem1_CheckedChanged_1(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarCheckItemShowSearch.CheckedChanged
         If GridIsLoaded = True Then
-            GridViewWFItems.OptionsFind.AlwaysVisible = BarCheckItemShowSearch.Checked
+            GridView_Docs.OptionsFind.AlwaysVisible = BarCheckItemShowSearch.Checked
         End If
     End Sub
 
@@ -2857,9 +2889,9 @@ Public Class frmMain
         FRONTEND_ACTION = FA_NONE
     End Sub
 
-    Private Sub BarButtonItem3_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick
-        GridLayout_Reset()
-    End Sub
+    Private Async Function BarButtonItem3_ItemClick_2(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) As Tasks.Task Handles BarButtonItem3.ItemClick
+        Await GridLayout_Reset()
+    End Function
 
     Private Sub BarButtonItem5_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemExportExcel.ItemClick
         Grid_Export()
@@ -2870,7 +2902,7 @@ Public Class frmMain
     End Sub
 
     Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick
-        GridViewWFItems.ShowCustomization()
+        GridView_Docs.ShowCustomization()
     End Sub
 
     Private Sub BarButtonItem8_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemWFSingle.ItemClick
@@ -2883,7 +2915,7 @@ Public Class frmMain
 
     Private Sub BarButtonItemFileLink_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemFileLink.ItemClick
         Dim oReceipiant = ""
-        Dim oFocusedDocGUID = GridViewWFItems.GetFocusedRowCellValue(GridViewWFItems.Columns("GUID"))
+        Dim oFocusedDocGUID = GridView_Docs.GetFocusedRowCellValue(GridView_Docs.Columns("GUID"))
         Dim oSQL = $"SELECT [dbo].[FNPM_GET_FILEPATH] ({oFocusedDocGUID},1)"
         Dim oFilePath = DatabaseFallback.GetScalarValueECM(oSQL)
         If File.Exists(oFilePath) Then
@@ -2898,8 +2930,8 @@ Public Class frmMain
 
     Private Async Sub BarButtonItemMassValidation_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemMassValidation.ItemClick
         Try
-            Dim oSelectedRows As Integer() = GridViewWFItems.GetSelectedRows()
-            Dim oHitInfo As GridHitInfo = GridViewWFItems.CalcHitInfo(GridCursorLocation)
+            Dim oSelectedRows As Integer() = GridView_Docs.GetSelectedRows()
+            Dim oHitInfo As GridHitInfo = GridView_Docs.CalcHitInfo(GridCursorLocation)
             Dim oSelectedRowHandle As Integer = oHitInfo.RowHandle
             Dim oWorkedFiles As Integer = 0
 
@@ -2915,7 +2947,7 @@ Public Class frmMain
                 Exit Sub
             End If
 
-            oProfileId = GridViewWFItems.GetRowCellValue(oSelectedRows.Last(), GridViewWFItems.Columns("PROFILE_ID"))
+            oProfileId = GridView_Docs.GetRowCellValue(oSelectedRows.Last(), GridView_Docs.Columns("PROFILE_ID"))
 
             If oProfileId = 0 Then
                 FormHelper.ShowInfoMessage("Could not select a profile!", omsgTitleWarning)
@@ -2956,18 +2988,18 @@ Public Class frmMain
 
                 For Each oRowHandle As Integer In oSelectedRows
 
-                    Dim oDocID = GridViewWFItems.GetRowCellValue(oRowHandle, "DocID")
+                    Dim oDocID = GridView_Docs.GetRowCellValue(oRowHandle, "DocID")
                     If IsNothing(oDocID) Then
                         Continue For
                     End If
                     Dim R As DataRow = NewDatatable.NewRow
                     CURRENT_DOC_ID = oDocID
-                    Dim DOC_PATH = GridViewWFItems.GetRowCellValue(oRowHandle, FullFilepatColName)
+                    Dim DOC_PATH = GridView_Docs.GetRowCellValue(oRowHandle, FullFilepatColName)
                     ' CURRENT_DOC_PATH = DOC_PATH
-                    CURRENT_DOC_GUID = GridViewWFItems.GetRowCellValue(oRowHandle, "GUID")
+                    CURRENT_DOC_GUID = GridView_Docs.GetRowCellValue(oRowHandle, "GUID")
                     R("DocID") = CURRENT_DOC_ID
                     R("FULL_PATH") = DOC_PATH
-                    R("DOC_GUID") = GridViewWFItems.GetRowCellValue(oRowHandle, "GUID")
+                    R("DOC_GUID") = GridView_Docs.GetRowCellValue(oRowHandle, "GUID")
                     NewDatatable.Rows.Add(R)
                 Next
 
@@ -3019,11 +3051,11 @@ Public Class frmMain
         End Try
     End Sub
 
-    Private Sub GridViewWFItems_SelectionChanged(sender As Object, e As DevExpress.Data.SelectionChangedEventArgs) Handles GridViewWFItems.SelectionChanged
+    Private Sub GridViewWFItems_SelectionChanged(sender As Object, e As DevExpress.Data.SelectionChangedEventArgs) Handles GridView_Docs.SelectionChanged
         Timer_Inactivity_Reset_Disable("GridViewWFItems_SelectionChanged")
     End Sub
 
-    Private Sub GridViewWFItems_Click(sender As Object, e As MouseEventArgs) Handles GridViewWFItems.Click
+    Private Sub GridViewWFItems_Click(sender As Object, e As MouseEventArgs) Handles GridView_Docs.Click
         Try
             If e.Button = Windows.Forms.MouseButtons.Right Then
                 RibbonControl1.SelectedPage = RibbonPageTabelle
@@ -3044,8 +3076,8 @@ Public Class frmMain
 
     End Sub
 
-    Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridViewWFItems.SubstituteFilter
+    Private Sub GridViewWFItems_SubstituteFilter(sender As Object, e As DevExpress.Data.SubstituteFilterEventArgs) Handles GridView_Docs.SubstituteFilter
         GridLayout_Changed("GridViewWFItems_SubstituteFilter")
-        RowCount
+        RowCount()
     End Sub
 End Class

app/DD_PM_WINDREAM/frmMassValidator.vb

@@ -700,7 +700,6 @@ Public Class frmMassValidator
                                     Dim oArrlist As New List(Of String)
                                     oArrlist.Add(oWindreamValue.ToString)
                                     oLookup.Properties.SelectedValues = oArrlist
-                                    '_CURRENT_INDEX_ARRAY(oCount, 1) = oWindreamValue.ToString
                                 End If
                             Else
                                 If Not IsNothing(oLookup.Properties.SelectedValues) Then

app/DD_PM_WINDREAM/frmValidator.resx

@@ -123,7 +123,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="SplitContainer2_DV_Chat.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 151</value>
+    <value>0, 158</value>
   </data>
   <data name="SplitContainer1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -178,7 +178,7 @@
     <value>MiddleLeft</value>
   </data>
   <data name="btnSave.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 454</value>
+    <value>7, 446</value>
   </data>
   <data name="btnSave.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
     <value>3, 4, 3, 4</value>
@@ -244,7 +244,7 @@
     <value>3, 4, 3, 4</value>
   </data>
   <data name="PanelValidatorControl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>444, 361</value>
+    <value>444, 353</value>
   </data>
   <data name="PanelValidatorControl.TabIndex" type="System.Int32, mscorlib">
     <value>18</value>
@@ -271,7 +271,7 @@
     <value>3, 4, 3, 4</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>455, 511</value>
+    <value>455, 503</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>24</value>
@@ -310,7 +310,7 @@
     <value>3, 4, 3, 4</value>
   </data>
   <data name="DocumentViewerValidator.Size" type="System.Drawing.Size, System.Drawing">
-    <value>460, 511</value>
+    <value>460, 503</value>
   </data>
   <data name="DocumentViewerValidator.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -340,7 +340,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>919, 511</value>
+    <value>919, 503</value>
   </data>
   <data name="SplitContainer1.SplitterDistance" type="System.Int32, mscorlib">
     <value>455</value>
@@ -391,7 +391,7 @@
     <value>3, 4, 3, 4</value>
   </data>
   <data name="ChatControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>254, 511</value>
+    <value>256, 503</value>
   </data>
   <data name="ChatControl1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -424,7 +424,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainer2_DV_Chat.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1185, 511</value>
+    <value>1185, 503</value>
   </data>
   <data name="SplitContainer2_DV_Chat.TabIndex" type="System.Int32, mscorlib">
     <value>44</value>
@@ -1070,13 +1070,13 @@
     <value>Start</value>
   </data>
   <data name="RibbonControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1185, 151</value>
+    <value>1185, 158</value>
   </data>
   <data name="RibbonStatusBar1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 662</value>
+    <value>0, 661</value>
   </data>
   <data name="RibbonStatusBar1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1185, 21</value>
+    <value>1185, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar1.Name" xml:space="preserve">
     <value>RibbonStatusBar1</value>

app/DD_PM_WINDREAM/frmValidator.vb

@@ -8,6 +8,7 @@ Imports DigitalData.Controls.LookupGrid
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.Modules.Language.Utils
+Imports DigitalData.Modules.Language
 Imports DigitalData.Modules.EDMI.API.DatabaseWithFallback
 Imports DigitalData.Modules.EDMI.API.Constants
 Imports DevExpress.XtraBars
@@ -15,6 +16,7 @@ Imports DigitalData.GUIs.Common.DocumentResultList
 Imports DigitalData.Modules.ZooFlow
 Imports DigitalData.Modules.ZooFlow.Constants
 Imports DigitalData.GUIs.Common
+Imports DevExpress.XtraGrid.Columns
 
 Public Class frmValidator
     Private Property Current_Document As DocumentResultList.Document = Nothing
@@ -71,7 +73,6 @@ Public Class frmValidator
     Private Property _Indexe_Loaded As Boolean = False
 
     Public Shared Property idxerr_message As String = ""
-    Private _CURRENT_INDEX_ARRAY(100, 250) As String
 
     Private Property _frmValidatorSearch As frmValidatorSearch 'You need a reference to Form1
     Private Property _dependingControl_in_action As Boolean = False
@@ -1545,10 +1546,10 @@ Public Class frmValidator
         Dim oControlname2Set = oRow.Item("NAME")
         LOGGER.Debug($"Workin on SetControLValue for {oControlname2Set} ...")
 
-        Dim oConnectionId = NotNull(oRow.Item("CONNECTION_ID"), 0)
+        Dim oConnectionId = NotNull(oRow.Item("CONNECTION_ID"), -1)
         Dim oControlDataSql = NotNull(oRow.Item("SET_CONTROL_DATA"), String.Empty)
 
-        If oConnectionId = 0 Or oControlDataSql = String.Empty Then
+        If oConnectionId = -1 Or oControlDataSql = String.Empty Then
             LOGGER.Debug($"Error: Check CoNN ID and SQL on NULL VALUES!")
             Exit Sub
         End If
@@ -2138,34 +2139,32 @@ Public Class frmValidator
                 End If
             Next
 
-
-
-        Catch ex As Exception
-            LOGGER.Error(ex)
-        End Try
-    End Sub
-    Private Sub Controls2beDisabled()
-        Try
-            Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
-            Dim oExpression = $"LEN(SQL_ENABLE) > 0"
-            DT_CONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
-            If oFilteredDatatable.Rows.Count > 0 Then
-                LOGGER.Debug($"We got {oFilteredDatatable.Rows.Count} controls which need to be disabled!!")
-            End If
-            For Each oRowEnablingControl As DataRow In oFilteredDatatable.Rows
-                Dim oENABLE_GUID = oRowEnablingControl.Item("GUID")
-                Dim oENABLE_CtrlName = oRowEnablingControl.Item("NAME")
-                For Each oControl As Control In PanelValidatorControl.Controls
-                    If oENABLE_GUID = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid Then
-                        oControl.Enabled = False
-                        Exit For
-                    End If
-                Next
-            Next
         Catch ex As Exception
             LOGGER.Error(ex)
         End Try
     End Sub
+    'Private Sub Controls2beDisabled()
+    '    Try
+    '        Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
+    '        Dim oExpression = $"LEN(SQL_ENABLE) > 0"
+    '        DT_CONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges)
+    '        If oFilteredDatatable.Rows.Count > 0 Then
+    '            LOGGER.Debug($"We got {oFilteredDatatable.Rows.Count} controls which need to be disabled!!")
+    '        End If
+    '        For Each oRowEnablingControl As DataRow In oFilteredDatatable.Rows
+    '            Dim oENABLE_GUID = oRowEnablingControl.Item("GUID")
+    '            Dim oENABLE_CtrlName = oRowEnablingControl.Item("NAME")
+    '            For Each oControl As Control In PanelValidatorControl.Controls
+    '                If oENABLE_GUID = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid Then
+    '                    oControl.Enabled = False
+    '                    Exit For
+    '                End If
+    '            Next
+    '        Next
+    '    Catch ex As Exception
+    '        LOGGER.Error(ex)
+    '    End Try
+    'End Sub
     Private Sub Controls2B_EnDisabled_on_Load()
         Try
             Dim oFilteredDatatable As DataTable = DT_CONTROLS.Clone()
@@ -2180,31 +2179,22 @@ Public Class frmValidator
                 For Each oControl As Control In PanelValidatorControl.Controls
                     If oENABLE_GUID = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid Then
                         LOGGER.Debug($"Found the Control on panel which needs to be checked [{oENABLE_GUID}]...")
-                        Dim oSqlCommand = IIf(IsDBNull(oRowEnablingControl.Item("SQL_ENABLE_ON_LOAD")), "", oRowEnablingControl.Item("SQL_ENABLE_ON_LOAD"))
-                        Dim oConID = oRowEnablingControl.Item("SQL_ENABLE_ON_LOAD_CONID")
-                        If Not IsDBNull(oConID) Then
-                            oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True)
 
-                            Dim oConnectionId As Integer = oRowEnablingControl.Item("CONNECTION_ID")
-                            Dim oENABLERESULT As Boolean = False
+                        'Dim oSqlCommand = IIf(IsDBNull(oRowEnablingControl.Item("SQL_ENABLE_ON_LOAD")), "", oRowEnablingControl.Item("SQL_ENABLE_ON_LOAD"))
+                        'Dim oConID = oRowEnablingControl.Item("SQL_ENABLE_ON_LOAD_CONID")
 
-                            oENABLERESULT = DatabaseFallback.GetScalarValueWithConnection(oSqlCommand, oConnectionId)
-
-
-
-
-
-                            Try
-                                LOGGER.Debug($"oENABLERESULT [{oENABLERESULT}]...")
-                                oControl.Enabled = oENABLERESULT
-                            Catch ex As Exception
-                                LOGGER.Warn($"Error en/disabling control onLoad: [{ex.Message}]")
-                            End Try
-                        Else
-                            LOGGER.Warn($"Attention SQL_ENABLE_ON_LOAD_CONID seems to be null!")
-                        End If
+                        Dim oConnectionId As Integer = oRowEnablingControl.ItemEx("CONNECTION_ID", 0)
+                        Dim oSqlCommand = oRowEnablingControl.ItemEx("SQL_ENABLE_ON_LOAD", String.Empty)
+                        oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, PanelValidatorControl, True)
 
+                        Dim oResult = DatabaseFallback.GetScalarValueWithConnection(oSqlCommand, oConnectionId)
 
+                        Try
+                            LOGGER.Debug($"Result of Enable SQL [{oResult}]...")
+                            oControl.Enabled = oResult
+                        Catch ex As Exception
+                            LOGGER.Warn($"Error en/disabling control onLoad: [{ex.Message}]")
+                        End Try
 
                     End If
                 Next
@@ -2493,7 +2483,6 @@ Public Class frmValidator
         WMDocPathWindows = ""
         WMDocFileString = ""
 
-        CURRENT_HTML_DOC = ""
 
         'Me.lblerror.Visible = False
         _Indexe_Loaded = False
@@ -3026,7 +3015,6 @@ Public Class frmValidator
 
 
                     LOGGER.Debug("INDEX: " & oSourceIndexName & " - CONTROLNAME: " & oControl.Name & " - LOAD IDXVALUES: " & oLoadIndex.ToString)
-                    _CURRENT_INDEX_ARRAY(oCount, 0) = oSourceIndexName
                     Select Case oType
                         Case "System.Windows.Forms.TextBox"
                             Try
@@ -3039,7 +3027,6 @@ Public Class frmValidator
                                     If oLoadIndex = False Or oSourceIndexName = "DD PM-ONLY FOR DISPLAY" Then
                                         ' Wenn kein Index exisitiert, defaultValue laden
                                         oControl.Text = oDefaultValue
-                                        _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue
                                         LOGGER.Debug("Indexwert soll nicht geladen werden.")
                                         Exit Select
                                     End If
@@ -3080,11 +3067,9 @@ Public Class frmValidator
                                         ClassControlCreator.GridTables_HandleControlValueChange(PanelValidatorControl, DT_COLUMNS_GRID_WITH_SQL_WITH_CTRL_PLACEHOLDER)
 
 
-                                        _CURRENT_INDEX_ARRAY(oCount, 1) = NotNull(oValueFromSource, oDefaultValue)
                                     Catch ex As Exception
                                         LOGGER.Info("ERROR while converting defaultValue [" & oDefaultValue & "]: " & ex.Message)
                                         oControl.Text = ""
-                                        _CURRENT_INDEX_ARRAY(oCount, 1) = ""
                                     End Try
 
 
@@ -3114,7 +3099,6 @@ Public Class frmValidator
                                             oMyCombobox.SelectedIndex = -1
                                         Else
                                             oMyCombobox.Text = oDefaultValue
-                                            _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue
                                         End If
                                         LOGGER.Debug($" oMyComboBox {oMyCombobox.Name}: Indexwert soll nicht geladen werden.")
                                         Exit Select
@@ -3135,7 +3119,6 @@ Public Class frmValidator
                                         Else
                                             LOGGER.Debug($"oMyComboBox {oMyCombobox.Name}-defaultValue wird geladen")
                                             oMyCombobox.Text = oDefaultValue
-                                            _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue
                                             'cmb.SelectedIndex = cmb.FindStringExact(defaultValue)
                                         End If
                                     Else
@@ -3159,8 +3142,6 @@ Public Class frmValidator
                                         LOGGER.Debug($"Indexwert from Index {oSourceIndexName}: {oValueFromSource}")
                                         LOGGER.Debug($"Items in Combobox: {oMyCombobox.Items.Count}")
 
-                                        _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource
-                                        LOGGER.Debug($"_CURRENT_INDEX_ARRAY set...")
                                         If oMyCombobox.Items.Count = 0 Then
                                             '    If LogErrorsOnly = False Then LOGGER.Info($"Index Wert wurde gesetzt")
                                             oMyCombobox.Text = oValueFromSource
@@ -3394,7 +3375,6 @@ Public Class frmValidator
                                     LOGGER.Info(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Checking defaultvalue")
                                     LOGGER.Debug(">> Zurückgegebener Wert des Wertes für Checkbox mit Indexname '" & oIndexName & "' ist nothing. Checking defaultvalue")
                                     If oDefaultValue <> String.Empty Then
-                                        _CURRENT_INDEX_ARRAY(oCount, 1) = oDefaultValue
                                         LOGGER.Info($"Using Default value [{oDefaultValue}]")
                                         LOGGER.Debug($"Using Default value [{oDefaultValue}]")
                                         myCheckBox.Checked = CBool(oDefaultValue)
@@ -3407,7 +3387,6 @@ Public Class frmValidator
 
                                 Else
                                     LOGGER.Debug("oValueFromSource: " & oValueFromSource.ToString)
-                                    _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource.ToString
                                     If oValueFromSource.ToString = "" Then
                                         LOGGER.Info(">> Versuch, default Value zu laden")
                                         If oDefaultValue <> String.Empty Then
@@ -3494,12 +3473,10 @@ Public Class frmValidator
                                         End If
 
                                         oLookup.Properties.SelectedValues = oArrlist
-                                        _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource.ToString
                                     Else
                                         Dim oArrlist As New List(Of String)
                                         oArrlist.Add(oValueFromSource.ToString)
                                         oLookup.Properties.SelectedValues = oArrlist
-                                        _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource.ToString
                                     End If
                                 Else
                                     If Not IsNothing(oLookup.Properties.SelectedValues) Then
@@ -3553,9 +3530,6 @@ Public Class frmValidator
                                         ValueDTP = tempdate
                                         DTP.Text = tempdate
                                     End If
-                                    _CURRENT_INDEX_ARRAY(oCount, 1) = oValueFromSource.ToString
-
-
                                 Catch ex As Exception
                                     LOGGER.Error(ex)
                                     errormessage = "Unvorhergesehener Fehler bei DTP: " & vbNewLine & ex.Message
@@ -3564,13 +3538,7 @@ Public Class frmValidator
                                     frmError.ShowDialog()
                                     LOGGER.Info("Unexpected error in FillIndex DTP: " & ex.Message, True)
                                 End Try
-
-
-
-
                             End If
-                            'Case Else
-                            '    MsgBox(Type)
                     End Select
                     oCount += 1
                 Next
@@ -3789,7 +3757,7 @@ Public Class frmValidator
 
         LOGGER.Debug("frmValidation_Shown finished!")
     End Sub
-    Private Sub btnSave_Click(sender As System.Object, e As System.EventArgs) Handles btnSave.Click
+    Private Sub btnSave_Click(sender As Object, e As EventArgs) Handles btnSave.Click
         btnSave.Enabled = False
 
         ' TODO: Use when working on Validation
@@ -3817,7 +3785,7 @@ Public Class frmValidator
                 Continue For
             End If
 
-            If oView.UpdateCurrentRow() = False Then
+            If DoCellValidation(oView) = False Then
                 oValidation = False
             End If
 
@@ -3831,6 +3799,28 @@ Public Class frmValidator
         Return True
     End Function
 
+    Private Function DoCellValidation(pView As GridView) As Boolean
+        For i As Integer = 0 To pView.DataRowCount - 1
+            Dim oRowHandle = i
+
+            pView.FocusedRowHandle = oRowHandle
+
+            For Each oColumn As GridColumn In pView.Columns
+                pView.FocusedColumn = oColumn
+
+                If pView.PostEditor() = True Then
+                    If pView.UpdateCurrentRow() = False Then
+                        Return False
+                    End If
+                Else
+                    Return False
+                End If
+            Next
+        Next
+
+        Return True
+    End Function
+
     Private Function btnFinish_continue()
         Try
             Dim oSQL = PROFIL_FINISH_SQL
@@ -3925,7 +3915,7 @@ Public Class frmValidator
                         'oDTFinalIndexing = DataASorDB.GetDatatable("DD_ECM", oSQL, "TBPM_PROFILE_FINAL_INDEXING", $"PROFIL_ID = {CURRENT_ProfilGUID}", "SEQUENCE")
                         oDTFinalIndexing = DatabaseFallback.GetDatatable("TBPM_PROFILE_FINAL_INDEXING", New GetDatatableOptions(oSQL, DatabaseType.ECM) With {
                             .FilterExpression = $"PROFIL_ID = {CURRENT_ProfilGUID}",
-                            .SortByColumn = "PROFILE_ID,TAB_INDEX"
+                            .SortByColumn = "PROFIL_ID,TAB_INDEX"
                         })
 
                         If oDTFinalIndexing?.Rows.Count > 0 Then
@@ -3934,6 +3924,7 @@ Public Class frmValidator
                             For Each oFinalIndexRow As DataRow In oDTFinalIndexing.Rows
                                 Dim oValue As String = oFinalIndexRow.Item("VALUE").ToString
                                 Dim oFinalIndex = oFinalIndexRow.Item("INDEXNAME")
+                                LOGGER.Debug($"Working on final index [{oFinalIndex}]...")
                                 Dim oContinueOnIndifferentState As Boolean = CBool(oFinalIndexRow.Item("CONTINUE_INDETERMINED"))
                                 Dim oIndexType = 0
                                 If IDB_ACTIVE = False Then
@@ -3953,14 +3944,7 @@ Public Class frmValidator
                                         ItemWorked = False
                                     End If
                                     If Not IsNothing(oSQLCommand) Then
-                                        Dim oDBResult = _Client.GetScalarValueFromConnection(oSQLCommand, oConnectionID)
-                                        Dim oResultfromSQL As Object = ""
-
-                                        If oDBResult.OK Then
-                                            oResultfromSQL = oDBResult.Scalar
-                                        End If
-                                        'Dim oResultfromSQL = ClassDatabase.Execute_Scalar_ConID(oSQLCommand, oConnectionID, "FinalIndex - oGUID: {oGUID}")
-
+                                        Dim oResultfromSQL As Object = DatabaseFallback.GetScalarValueWithConnection(oSQLCommand, oConnectionID)
                                         If Not IsNothing(oResultfromSQL) Then
                                             LOGGER.Debug($"oResultfromSQL is [{oResultfromSQL.ToString}]")
                                             If IsDBNull(oResultfromSQL) Then
@@ -4391,11 +4375,13 @@ Public Class frmValidator
                     Dim oIsRequired As Boolean = CBool(oControlRow.Item("VALIDATION"))
                     Dim oSQLCheckCommand As String = IIf(IsDBNull(oControlRow.Item("SQL_UEBERPRUEFUNG")), "", oControlRow.Item("SQL_UEBERPRUEFUNG"))
                     Dim oIsReadOnly As Boolean = CBool(oControlRow.Item("READ_ONLY"))
+                    Dim oSaveChangeEnabledFalse As Boolean = CBool(oControlRow.Item("SAVE_CHANGE_ON_ENABLED"))
 
-                    If oIsReadOnly = True Then
-
+                    'Readonly felder werden über finale indexe gefüllt, nicht mit SetControlData
+                    If oIsReadOnly = True And oSaveChangeEnabledFalse = False Then
                         Continue For
                     End If
+
                     Dim oControlType As String = oControlRow.Item("CTRL_TYPE")
                     Dim oIDBTyp As Integer
                     If IDB_ACTIVE Then
@@ -5091,130 +5077,147 @@ Public Class frmValidator
                                 End Try
 
                             Case "DevExpress.XtraGrid.GridControl"
-                                Try
-                                    Dim dgv As GridControl = oControl
+                                Dim oGrid As GridControl = oControl
+                                Dim oSettings = New ControlSettings() With {
+                                    .IndexName = oIndexName,
+                                    .ControlType = Type,
+                                    .Name = oControlName,
+                                    .IsRequired = oIsRequired,
+                                    .IDBAttributeType = oIDBTyp
+                                }
+                                Dim oGridColumnDefinition As DataTable = DT_COLUMNS_GRID.Clone()
+                                Dim oExpression = $"CONTROL_ID = {oControlRow.Item("GUID")}"
+                                DT_COLUMNS_GRID.Select(oExpression, "SEQUENCE").CopyToDataTable(oGridColumnDefinition, LoadOption.PreserveChanges)
 
-                                    Dim oRowCount As Integer = dgv.DataSource.Rows.Count
+                                Dim oResult = ValidateGridControl(oGrid, oSettings, oGridColumnDefinition, oMissing, oErrMsgMissingInput)
+                                If oResult = False Then
+                                    Exit For
+                                End If
 
-                                    LOGGER.Debug("Grid Row Count: [{0}]", oRowCount)
+                                'Try
+                                '    Dim dgv As GridControl = oControl
 
-                                    'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
-                                    If oIsRequired = True And oRowCount = 0 Then
-                                        oMissing = True
-                                        oErrMsgMissingInput = "Fehlende Eingabe in Tabelle '" & dgv.Name & "'"
-                                        oControl.BackColor = Color.Red
-                                        LOGGER.Warn(oErrMsgMissingInput)
-                                        Exit For
+                                '    Dim oRowCount As Integer = dgv.DataSource.Rows.Count
+
+                                '    LOGGER.Debug("Grid Row Count: [{0}]", oRowCount)
+
+                                '    'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
+                                '    If oIsRequired = True And oRowCount = 0 Then
+                                '        oMissing = True
+                                '        oErrMsgMissingInput = "Fehlende Eingabe in Tabelle '" & dgv.Name & "'"
+                                '        oControl.BackColor = Color.Red
+                                '        LOGGER.Warn(oErrMsgMissingInput)
+                                '        Exit For
 
 
-                                    ElseIf oRowCount > 0 Then
-                                        Dim ZeilenGrid As Integer = 0
-                                        Dim myVektorArr As String()
-                                        'Jeden Werte des Datagridviews durchlaufen
-                                        For Each row As DataRow In dgv.DataSource.Rows
-                                            Dim exists = False
-                                            Select Case oControlType
-                                                Case "TABLE"
-                                                    Dim oRowValue = row.Item(0)
-                                                    If IsNothing(oRowValue) Then
-                                                        oRowValue = String.Empty
-                                                    ElseIf IsDBNull(oRowValue) Then
-                                                        oRowValue = String.Empty
-                                                    End If
-                                                    ' MsgBox(row.Cells(0).Value.GetType.ToString)
-                                                    Dim str As String = String.Empty
-                                                    'If oRowValue <> String.Empty Then
-                                                    'Das Array anpassen
-                                                    ReDim Preserve myVektorArr(ZeilenGrid)
+                                '    ElseIf oRowCount > 0 Then
+                                '        Dim ZeilenGrid As Integer = 0
+                                '        Dim myVektorArr As String()
+                                '        'Jeden Werte des Datagridviews durchlaufen
+                                '        For Each oRow As DataRow In dgv.DataSource.Rows
+                                '            Dim exists = False
+                                '            Select Case oControlType
+                                '                Case "TABLE"
+                                '                    Dim oRowValue = oRow.Item(0)
+                                '                    If IsNothing(oRowValue) Then
+                                '                        oRowValue = String.Empty
+                                '                    ElseIf IsDBNull(oRowValue) Then
+                                '                        oRowValue = String.Empty
+                                '                    End If
+                                '                    ' MsgBox(row.Cells(0).Value.GetType.ToString)
+                                '                    Dim str As String = String.Empty
+                                '                    'If oRowValue <> String.Empty Then
+                                '                    'Das Array anpassen
+                                '                    ReDim Preserve myVektorArr(ZeilenGrid)
 
-                                                    Dim oValueList As New List(Of String)
+                                '                    Dim oValueList As New List(Of String)
 
-                                                    For Each item In row.ItemArray
-                                                        item = NotNull(item, String.Empty)
-                                                        If TypeOf item IsNot String Then item.ToString()
-                                                        oValueList.Add(item)
-                                                    Next
+                                '                    For Each item In oRow.ItemArray
+                                '                        item = NotNull(item, String.Empty)
+                                '                        If TypeOf item IsNot String Then item.ToString()
+                                '                        oValueList.Add(item)
+                                '                    Next
 
-                                                    str = String.Join(PMDelimiter, oValueList.ToArray)
+                                '                    str = String.Join(PMDelimiter, oValueList.ToArray)
 
-                                                    ' 22.10.2021 Attempt at fixing empty lines appearing in indexes
-                                                    LOGGER.Debug("Grid Value before saving: [{0}]", str)
-                                                    If str.Trim.Length = 0 Or str.Trim.Replace(PMDelimiter, "").Length = 0 Then
-                                                        LOGGER.Debug("Empty line in Grid [{0}]. Skipping.", oControlName)
-                                                        Continue For
-                                                    End If
+                                '                    ' 22.10.2021 Attempt at fixing empty lines appearing in indexes
+                                '                    LOGGER.Debug("Grid Value before saving: [{0}]", str)
+                                '                    If str.Trim.Length = 0 Or str.Trim.Replace(PMDelimiter, "").Length = 0 Then
+                                '                        LOGGER.Debug("Empty line in Grid [{0}]. Skipping.", oControlName)
+                                '                        Continue For
+                                '                    End If
 
-                                                    'Den Wert im Array speichern
-                                                    myVektorArr(ZeilenGrid) = str
-                                                    ZeilenGrid += 1
-                                                    'End If
-                                                Case Else
-                                                    ' MsgBox(row.Cells(0).Value.GetType.ToString)
-                                                    If row.Item(0) Is Nothing = False Then
-                                                        'Das Array anpassen
-                                                        ReDim Preserve myVektorArr(ZeilenGrid)
-                                                        'Den Wert im Array speichern
-                                                        myVektorArr(ZeilenGrid) = row.Item(0).Value.ToString
-                                                        ZeilenGrid += 1
-                                                    End If
-                                            End Select
+                                '                    'Den Wert im Array speichern
+                                '                    myVektorArr(ZeilenGrid) = str
+                                '                    ZeilenGrid += 1
+                                '                    'End If
+                                '                Case Else
+                                '                    ' MsgBox(row.Cells(0).Value.GetType.ToString)
+                                '                    If oRow.Item(0) Is Nothing = False Then
+                                '                        'Das Array anpassen
+                                '                        ReDim Preserve myVektorArr(ZeilenGrid)
+                                '                        'Den Wert im Array speichern
+                                '                        myVektorArr(ZeilenGrid) = oRow.Item(0).Value.ToString
+                                '                        ZeilenGrid += 1
+                                '                    End If
+                                '            End Select
 
-                                        Next
+                                '        Next
 
 
-                                        If IDB_ACTIVE = False Then
-                                            If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then
-                                                oMissing = True
-                                                oErrMsgMissingInput = $"Error while indexing table (1) {dgv.Name} - ERROR: " & idxerr_message
-                                                LOGGER.Warn(oErrMsgMissingInput)
-                                                Exit For
-                                            End If
-                                        Else
-                                            Dim oMyDT = DT_FOR_ARRAY(myVektorArr)
-                                            If oMyDT.Rows.Count > 0 Then
-                                                If IDBData.SetVariableValue(oIndexName, oMyDT, True, oIDBTyp) = False Then
-                                                    oMissing = True
-                                                    oErrMsgMissingInput = $"Error while indexing table IDB (1) {dgv.Name} - ERROR: " & idxerr_message
-                                                    LOGGER.Warn(oErrMsgMissingInput)
-                                                    Exit For
-                                                End If
-                                            End If
-                                        End If
+                                '        If IDB_ACTIVE = False Then
+                                '            If Indexiere_File(CURRENT_WMFILE, oIndexName, myVektorArr) = False Then
+                                '                oMissing = True
+                                '                oErrMsgMissingInput = $"Error while indexing table (1) {dgv.Name} - ERROR: " & idxerr_message
+                                '                LOGGER.Warn(oErrMsgMissingInput)
+                                '                Exit For
+                                '            End If
+                                '        Else
+                                '            Dim oMyDT = DT_FOR_ARRAY(myVektorArr)
+                                '            If oMyDT.Rows.Count > 0 Then
+                                '                If IDBData.SetVariableValue(oIndexName, oMyDT, True, oIDBTyp) = False Then
+                                '                    oMissing = True
+                                '                    oErrMsgMissingInput = $"Error while indexing table IDB (1) {dgv.Name} - ERROR: " & idxerr_message
+                                '                    LOGGER.Warn(oErrMsgMissingInput)
+                                '                    Exit For
+                                '                End If
+                                '            End If
+                                '        End If
 
 
-                                    Else
-                                        LOGGER.Debug("Required = False And RowCount > 0")
+                                '    Else
+                                '        LOGGER.Debug("Required = False And RowCount > 0")
 
-                                        Dim oValue As New List(Of Object) From {String.Empty}
+                                '        Dim oValue As New List(Of Object) From {String.Empty}
 
-                                        If IDB_ACTIVE = False Then
-                                            If Indexiere_File(CURRENT_WMFILE, oIndexName, oValue.ToArray) = False Then
-                                                oMissing = True
-                                                'oErrorMessage = "Error while indexing der Tabelle - ERROR: " & idxerr_message
-                                                oErrMsgMissingInput = $"Error while indexing table (2) {dgv.Name} - ERROR: " & idxerr_message
-                                                LOGGER.Warn(oErrMsgMissingInput)
-                                                Exit For
-                                            End If
-                                        Else
-                                            Dim oOldAttributeResult = IDBData.GetVariableValue(oIndexName, oIDBTyp)
-                                            Dim oTypeOldResult = oOldAttributeResult.GetType.ToString
-                                            If oTypeOldResult = "System.Data.DataTable" Then
-                                                Dim oDT As DataTable = IDBData.GetVariableValue(oIndexName, oIDBTyp)
-                                                If oDT.Rows.Count > 0 Then
-                                                    LOGGER.Debug("User cleared the grid, so data needs to be erased!")
-                                                    IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName)
-                                                End If
-                                            Else
-                                                LOGGER.Debug("(String) User cleared the grid, so data needs to be erased!")
-                                                IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName)
-                                            End If
+                                '        If IDB_ACTIVE = False Then
+                                '            If Indexiere_File(CURRENT_WMFILE, oIndexName, oValue.ToArray) = False Then
+                                '                oMissing = True
+                                '                'oErrorMessage = "Error while indexing der Tabelle - ERROR: " & idxerr_message
+                                '                oErrMsgMissingInput = $"Error while indexing table (2) {dgv.Name} - ERROR: " & idxerr_message
+                                '                LOGGER.Warn(oErrMsgMissingInput)
+                                '                Exit For
+                                '            End If
+                                '        Else
+                                '            Dim oOldAttributeResult = IDBData.GetVariableValue(oIndexName, oIDBTyp)
+                                '            Dim oTypeOldResult = oOldAttributeResult.GetType.ToString
+                                '            If oTypeOldResult = "System.Data.DataTable" Then
+                                '                Dim oDT As DataTable = IDBData.GetVariableValue(oIndexName, oIDBTyp)
+                                '                If oDT.Rows.Count > 0 Then
+                                '                    LOGGER.Debug("User cleared the grid, so data needs to be erased!")
+                                '                    IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName)
+                                '                End If
+                                '            Else
+                                '                LOGGER.Debug("(String) User cleared the grid, so data needs to be erased!")
+                                '                IDBData.Delete_AttributeData(CURRENT_DOC_ID, oIndexName)
+                                '            End If
 
-                                        End If
+                                '        End If
 
-                                    End If
-                                Catch ex As Exception
-                                    LOGGER.Error(ex)
-                                End Try
+                                '    End If
+                                'Catch ex As Exception
+                                '    LOGGER.Error(ex)
+                                'End Try
                         End Select
                     End If  'End If für Control und ReadOnly = False
                 Next
@@ -5243,6 +5246,184 @@ Public Class frmValidator
         End Try
 
     End Function
+
+    Private Class ControlSettings
+        Public Name As String
+        Public IsRequired As Boolean
+        Public IndexName As String
+        Public ControlType As String
+        Public IDBAttributeType As Integer
+    End Class
+
+    Private Function ValidateGridControl(pGrid As GridControl, pSettings As ControlSettings, pColumnDefinition As DataTable, ByRef pMissing As Boolean, ByRef pMissingMessage As String) As Boolean
+        Try
+            Dim oRowCount As Integer = pGrid.DataSource.Rows.Count
+
+            LOGGER.Debug("Grid Row Count: [{0}]", oRowCount)
+
+            'Wenn kein Wert ausgewählt wurde und der Index aber gesetzt werden muss
+            If pSettings.IsRequired = True And oRowCount = 0 Then
+                pMissing = True
+                pMissingMessage = "Fehlende Eingabe in Tabelle '" & pGrid.Name & "'"
+                pGrid.BackColor = Color.Red
+                LOGGER.Warn(pMissingMessage)
+
+                'Exit For
+                Return False
+
+            End If
+
+            If oRowCount > 0 Then
+
+                Dim oView As GridView = pGrid.FocusedView
+                Dim oDatasource As DataTable = pGrid.DataSource
+                Dim oRowIndex As Integer = 0
+
+                For Each oRow As DataRow In oDatasource.Rows
+                    For Each oColumn As DataColumn In oRow.Table.Columns
+
+                        Dim oValue = oRow.ItemEx(oColumn.ColumnName, "")
+                        Dim oDefinition = pColumnDefinition.AsEnumerable().
+                            Where(Function(row) row.Item("SPALTENNAME") = oColumn.ColumnName).
+                            FirstOrDefault()
+
+                        If oDefinition IsNot Nothing Then
+                            Dim oIsRequired = oDefinition.Item("VALIDATION")
+
+                            If oIsRequired = True And oValue = String.Empty Then
+
+                                ' Translates the visible row index into the internal rowhandle
+                                ' they might be different because of sorting
+                                Dim oRowHandle = oView.GetRowHandle(oRowIndex)
+
+                                oView.FocusedRowHandle = oRowHandle
+                                oView.FocusedColumn = oView.Columns.Item(oColumn.ColumnName)
+
+                                pMissing = True
+                                pMissingMessage = $"Fehlende Eingabe in Tabelle '{pGrid.Name}' in Spalte '{oDefinition.Item("SPALTEN_HEADER")}', Zeile '{oRowHandle + 1}'"
+                                Return False
+                            End If
+                        End If
+                    Next
+
+                    oRowIndex += 1
+                Next
+
+                Dim ZeilenGrid As Integer = 0
+                Dim myVektorArr As String()
+                'Jeden Werte des Datagridviews durchlaufen
+                For Each oRow As DataRow In pGrid.DataSource.Rows
+                    Dim exists = False
+                    Select Case pSettings.ControlType
+                        Case "TABLE"
+                            Dim oRowValue = oRow.Item(0)
+                            If IsNothing(oRowValue) Then
+                                oRowValue = String.Empty
+                            ElseIf IsDBNull(oRowValue) Then
+                                oRowValue = String.Empty
+                            End If
+                            ' MsgBox(row.Cells(0).Value.GetType.ToString)
+                            Dim str As String = String.Empty
+                            'If oRowValue <> String.Empty Then
+                            'Das Array anpassen
+                            ReDim Preserve myVektorArr(ZeilenGrid)
+
+                            Dim oValueList As New List(Of String)
+
+                            For Each item In oRow.ItemArray
+                                item = NotNull(item, String.Empty)
+                                If TypeOf item IsNot String Then item.ToString()
+                                oValueList.Add(item)
+                            Next
+
+                            str = String.Join(PMDelimiter, oValueList.ToArray)
+
+                            ' 22.10.2021 Attempt at fixing empty lines appearing in indexes
+                            LOGGER.Debug("Grid Value before saving: [{0}]", str)
+                            If str.Trim.Length = 0 Or str.Trim.Replace(PMDelimiter, "").Length = 0 Then
+                                LOGGER.Debug("Empty line in Grid [{0}]. Skipping.", pSettings.Name)
+                                Continue For
+                            End If
+
+                            'Den Wert im Array speichern
+                            myVektorArr(ZeilenGrid) = str
+                            ZeilenGrid += 1
+                            'End If
+                        Case Else
+                            ' MsgBox(row.Cells(0).Value.GetType.ToString)
+                            If oRow.Item(0) Is Nothing = False Then
+                                'Das Array anpassen
+                                ReDim Preserve myVektorArr(ZeilenGrid)
+                                'Den Wert im Array speichern
+                                myVektorArr(ZeilenGrid) = oRow.Item(0).Value.ToString
+                                ZeilenGrid += 1
+                            End If
+                    End Select
+
+                Next
+
+
+                If IDB_ACTIVE = False Then
+                    If Indexiere_File(CURRENT_WMFILE, pSettings.IndexName, myVektorArr) = False Then
+                        pMissing = True
+                        pMissingMessage = $"Error while indexing table (1) {pGrid.Name} - ERROR: " & idxerr_message
+                        LOGGER.Warn(pMissingMessage)
+                        'Exit For
+                        Return False
+                    End If
+                Else
+                    Dim oMyDT = DT_FOR_ARRAY(myVektorArr)
+                    If oMyDT.Rows.Count > 0 Then
+                        If IDBData.SetVariableValue(pSettings.IndexName, oMyDT, True, pSettings.IDBAttributeType) = False Then
+                            pMissing = True
+                            pMissingMessage = $"Error while indexing table IDB (1) {pGrid.Name} - ERROR: " & idxerr_message
+                            LOGGER.Warn(pMissingMessage)
+                            'Exit For
+                            Return False
+                        End If
+                    End If
+                End If
+
+
+            Else ' Row Count = 0
+
+                Dim oValue As New List(Of Object) From {String.Empty}
+
+                If IDB_ACTIVE = False Then
+                    If Indexiere_File(CURRENT_WMFILE, pSettings.IndexName, oValue.ToArray) = False Then
+                        pMissing = True
+                        'oErrorMessage = "Error while indexing der Tabelle - ERROR: " & idxerr_message
+                        pMissingMessage = $"Error while indexing table (2) {pGrid.Name} - ERROR: " & idxerr_message
+                        LOGGER.Warn(pMissingMessage)
+                        'Exit For
+                        Return False
+                    End If
+                Else
+                    Dim oOldAttributeResult = IDBData.GetVariableValue(pSettings.IndexName, pSettings.IDBAttributeType)
+                    Dim oTypeOldResult = oOldAttributeResult.GetType.ToString
+                    If oTypeOldResult = "System.Data.DataTable" Then
+                        Dim oDT As DataTable = IDBData.GetVariableValue(pSettings.IndexName, pSettings.IDBAttributeType)
+                        If oDT.Rows.Count > 0 Then
+                            LOGGER.Debug("User cleared the grid, so data needs to be erased!")
+                            IDBData.Delete_AttributeData(CURRENT_DOC_ID, pSettings.IndexName)
+                        End If
+                    Else
+                        LOGGER.Debug("(String) User cleared the grid, so data needs to be erased!")
+                        IDBData.Delete_AttributeData(CURRENT_DOC_ID, pSettings.IndexName)
+                    End If
+
+                End If
+
+            End If
+
+            Return True
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            Return False
+        End Try
+    End Function
+
+
     Private Function Indexiere_File(_dok As WINDREAMLib.WMObject, pIndexName As String, pIndexValues As Object) As Boolean
         Dim File_indexiert As Boolean = False
         idxerr_message = ""

app/SetupVS19/Product.wxs

@@ -128,6 +128,7 @@
 				<File Id="DDWindows" Name="DigitalData.Modules.Windows.dll" Source="DigitalData.Modules.Windows.dll"/>
 				<File Id="DDZooflow" Name="DigitalData.Modules.Zooflow.dll" Source="DigitalData.Modules.Zooflow.dll"/>
 				<File Id="DDDatabase" Name="DigitalData.Modules.Database.dll" Source="DigitalData.Modules.Database.dll"/>
+				<File Id="DDPatterns" Name="DigitalData.Modules.Patterns.dll" Source="DigitalData.Modules.Patterns.dll"/>
 				<File Id="DDEDMIAPI" Name="DigitalData.Modules.EDMI.API.dll" Source="DigitalData.Modules.EDMI.API.dll"/>
 				<File Id="DDDocumentViewer" Name="DigitalData.Controls.DocumentViewer.dll" Source="DigitalData.Controls.DocumentViewer.dll"/>
 				<File Id="DDChatControl" Name="DigitalData.Controls.ChatControl.dll" Source="DigitalData.Controls.ChatControl.dll"/>