From 0cdca65efed4c4f491f7b5419dbf03876b6eef2a Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 27 Mar 2018 15:57:45 +0200
Subject: [PATCH 01/14] jj: Anzeige der Controls anpassen, ClassControlCreator
 benutzen

---
 app/DD_PM_WINDREAM/ClassControlCreator.vb     | 204 ++++
 .../DD_DMSLiteDataSet.Designer.vb             |  54 +-
 app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd      |  51 +-
 app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss      |  30 +-
 app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj      |   1 +
 app/DD_PM_WINDREAM/ModuleControlProperties.vb |  24 +
 .../frmFormDesigner.Designer.vb               | 996 +++++++++---------
 app/DD_PM_WINDREAM/frmFormDesigner.resx       |  18 +-
 app/DD_PM_WINDREAM/frmFormDesigner.vb         | 715 +++++--------
 app/DD_PM_WINDREAM/frmMain.vb                 |   1 -
 app/DD_PM_WINDREAM/frmValidator.vb            | 622 +++++++----
 11 files changed, 1539 insertions(+), 1177 deletions(-)
 create mode 100644 app/DD_PM_WINDREAM/ClassControlCreator.vb

diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb
new file mode 100644
index 0000000..692440b
--- /dev/null
+++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb
@@ -0,0 +1,204 @@
+Imports DD_LIB_Standards
+
+Public Class ClassControlCreator
+
+    ''' <summary>
+    ''' Konstanten
+    ''' </summary>
+    Private Const LABEL_TEXT = "Bezeichnung definieren"
+
+    Private Const DEFAULT_FONT_SIZE As Integer = 10
+    Private Const DEFAULT_FONT_FAMILY As String = "Arial"
+    Private Const DEFAULT_FONT_STYLE As FontStyle = FontStyle.Regular
+    Private Const DEFAULT_COLOR As Integer = 0
+    Private Const DEFAULT_WIDTH As Integer = 170
+    Private Const DEFAULT_HEIGHT As Integer = 20
+
+    Private Const PREFIX_TEXTBOX = "TXT"
+
+    ''' <summary>
+    ''' Standard Eigenschaften für alle Controls
+    ''' </summary>
+    Private Class ControlDBProps
+        Public Guid As Integer
+        Public Name As String
+        Public Location As Point
+        Public [Font] As Font
+        Public [Color] As Color
+    End Class
+
+    Private Shared Function TransformDataRow(row As DataRow) As ControlDBProps
+        Dim x As Integer = row.Item("X_LOC")
+        Dim y As Integer = row.Item("Y_LOC")
+        Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), DEFAULT_FONT_STYLE)
+        Dim size As Single = NotNull(row.Item("FONT_SIZE"), DEFAULT_FONT_SIZE)
+        Dim familyString As String = NotNull(row.Item("FONT_FAMILY"), DEFAULT_FONT_FAMILY)
+        Dim family As FontFamily = New FontFamily(familyString)
+
+        Dim Guid As Integer = row.Item("GUID")
+        Dim Name As String = row.Item("NAME")
+        Dim Location As New Point(x, y)
+        Dim Font As New Font(family, size, style, GraphicsUnit.Point)
+        Dim Color As Color = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
+
+        Return New ControlDBProps() With {
+            .Guid = Guid,
+            .Name = Name,
+            .Location = Location,
+            .Font = Font,
+            .Color = Color
+        }
+    End Function
+
+    Public Shared Function CreateBaseControl(ctrl As Control, row As DataRow) As Control
+        Dim props As ControlDBProps = TransformDataRow(row)
+
+        ctrl.Tag = props.Guid
+        ctrl.Name = props.Name
+        ctrl.Location = props.Location
+        ctrl.Font = props.Font
+        ctrl.ForeColor = props.Color
+
+        Return ctrl
+    End Function
+
+    ' ----------------------- NEW CONTROLS -----------------------
+
+    Public Shared Function CreateNewTextBox(location As Point) As TextBox
+        Dim control As New TextBox With {
+            .Name = $"{PREFIX_TEXTBOX}_{clsTools.ShortGUID()}",
+            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
+            .Location = location,
+            .ReadOnly = True,
+            .BackColor = Color.White,
+            .Cursor = Cursors.Hand
+        }
+
+        Return control
+
+    End Function
+
+    ' ----------------------- EXISITING CONTROLS -----------------------
+
+    Public Shared Function CreateExistingTextbox(row As DataRow, designMode As Boolean) As TextBox
+        Dim control As TextBox = CreateBaseControl(New TextBox(), row)
+
+        control.BackColor = Color.White
+        control.Cursor = Cursors.Hand
+
+        If row.Item("HEIGHT") > 27 Then
+            control.Multiline = True
+
+        End If
+
+        control.Height = row.Item("HEIGHT")
+        control.Width = row.Item("WIDTH")
+
+        If Not designMode Then
+            control.AcceptsReturn = True
+            control.ReadOnly = row.Item("READ_ONLY")
+            control.TabStop = Not row.Item("READ_ONLY")
+        Else
+            control.ReadOnly = True
+        End If
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingLabel(row As DataRow, designMode As Boolean) As Label
+        Dim control As Label = CreateBaseControl(New Label(), row)
+
+        control.Text = row.Item("CTRL_TEXT")
+        control.AutoSize = True
+        control.Cursor = Cursors.Hand
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingCombobox(row As DataRow, designMode As Boolean) As ComboBox
+        Dim control As ComboBox = CreateBaseControl(New ComboBox(), row)
+
+        control.Cursor = Cursors.Hand
+        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+
+        If Not designMode Then
+            control.Enabled = Not row.Item("READ_ONLY")
+            control.TabStop = Not row.Item("READ_ONLY")
+
+            control.AutoCompleteMode = AutoCompleteMode.SuggestAppend
+            control.AutoCompleteSource = AutoCompleteSource.ListItems
+
+        End If
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingDatepicker(row As DataRow, designMode As Boolean) As DateTimePicker
+        Dim control As DateTimePicker = CreateBaseControl(New DateTimePicker(), row)
+
+        control.Cursor = Cursors.Hand
+        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+        control.Format = DateTimePickerFormat.Short
+
+        If Not designMode Then
+            control.Enabled = Not row.Item("READ_ONLY")
+            control.TabStop = Not row.Item("READ_ONLY")
+        End If
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExisingCheckbox(row As DataRow, designMode As Boolean) As CheckBox
+        Dim control As CheckBox = CreateBaseControl(New CheckBox(), row)
+
+        control.AutoSize = True
+        control.Text = row.Item("CTRL_TEXT")
+        control.Cursor = Cursors.Hand
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingDataGridView(row As DataRow, designMode As Boolean) As DataGridView
+        Dim control As DataGridView = CreateBaseControl(New DataGridView(), row)
+
+        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+        control.Cursor = Cursors.Hand
+        control.AllowUserToAddRows = False
+        control.AllowUserToDeleteRows = False
+        control.AllowUserToResizeColumns = False
+        control.AllowUserToResizeRows = False
+        control.AlternatingRowsDefaultCellStyle.BackColor = Color.Aqua
+
+        Dim col As New DataGridViewTextBoxColumn
+        col.HeaderText = ""
+        col.Name = "column1"
+        col.Width = control.Width - 30
+        control.Columns.Add(col)
+
+        Return control
+    End Function
+
+    Public Shared Function CreateExistingTable(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As DataGridView
+        Dim control As DataGridView = CreateBaseControl(New DataGridView(), row)
+
+        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+        control.Cursor = Cursors.Hand
+        control.AllowUserToAddRows = False
+        control.AllowUserToDeleteRows = False
+        control.AllowUserToResizeColumns = False
+        control.AllowUserToResizeRows = False
+
+        For Each column As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In columns
+            Dim col As New DataGridViewTextBoxColumn() With {
+                .HeaderText = column.SPALTEN_HEADER,
+                .Name = column.SPALTENNAME,
+                .Width = column.SPALTENBREITE
+            }
+
+            control.Columns.Add(col)
+        Next
+
+        Return control
+    End Function
+
+End Class
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb
index f9b280f..2c20a23 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb
@@ -19643,7 +19643,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0")>  _
         Private Sub InitCommandCollection()
-            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(3) {}
+            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(4) {}
             Me._commandCollection(0) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(0).Connection = Me.Connection
             Me._commandCollection(0).CommandText = "SELECT        GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALID"& _ 
@@ -19670,19 +19670,23 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._commandCollection(1).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._commandCollection(2) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(2).Connection = Me.Connection
-            Me._commandCollection(2).CommandText = "SELECT        GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALID"& _ 
-                "ATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED"& _ 
-                "_WHO, ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM    "& _ 
-                "        TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @GUID)"
+            Me._commandCollection(2).CommandText = "SELECT       *"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"
             Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(2).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(3) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(3).Connection = Me.Connection
-            Me._commandCollection(3).CommandText = "SELECT GUID FROM TBPM_CONTROL_TABLE where Control_ID = @control_id and Spaltennam"& _ 
-                "e = @spaltenname"
+            Me._commandCollection(3).CommandText = "SELECT        GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALID"& _ 
+                "ATION, CHOICE_LIST, CONNECTION_ID, SQL_COMMAND, READ_ONLY, LOAD_IDX_VALUE, ADDED"& _ 
+                "_WHO, ADDED_WHEN, "&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         CHANGED_WHO, CHANGED_WHEN"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM    "& _ 
+                "        TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @GUID)"
             Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text
-            Me._commandCollection(3).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._commandCollection(3).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, "", "", ""))
+            Me._commandCollection(3).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(4) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(4).Connection = Me.Connection
+            Me._commandCollection(4).CommandText = "SELECT GUID FROM TBPM_CONTROL_TABLE where Control_ID = @control_id and Spaltennam"& _ 
+                "e = @spaltenname"
+            Me._commandCollection(4).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(4).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._commandCollection(4).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, "", "", ""))
         End Sub
         
         <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
@@ -19715,8 +19719,32 @@ Namespace DD_DMSLiteDataSetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, false)>  _
-        Public Overloads Overridable Function FillByGUID(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable, ByVal GUID As Integer) As Integer
+        Public Overloads Overridable Function FillAll(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable) As Integer
             Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            If (Me.ClearBeforeFill = true) Then
+                dataTable.Clear
+            End If
+            Dim returnValue As Integer = Me.Adapter.Fill(dataTable)
+            Return returnValue
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], false)>  _
+        Public Overloads Overridable Function GetDataAll() As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable
+            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            Dim dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable = New DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable()
+            Me.Adapter.Fill(dataTable)
+            Return dataTable
+        End Function
+        
+        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+         Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
+         Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
+         Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, false)>  _
+        Public Overloads Overridable Function FillByGUID(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable, ByVal GUID As Integer) As Integer
+            Me.Adapter.SelectCommand = Me.CommandCollection(3)
             Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer)
             If (Me.ClearBeforeFill = true) Then
                 dataTable.Clear
@@ -19730,7 +19758,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.[Select], false)>  _
         Public Overloads Overridable Function GetDataByGUID(ByVal GUID As Integer) As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable
-            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            Me.Adapter.SelectCommand = Me.CommandCollection(3)
             Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer)
             Dim dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable = New DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable()
             Me.Adapter.Fill(dataTable)
@@ -20059,7 +20087,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
          Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Data.Design.TypedDataSetGenerator", "15.0.0.0"),  _
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter")>  _
         Public Overloads Overridable Function getColumnID(ByVal control_id As Integer, ByVal spaltenname As String) As Global.System.Nullable(Of Integer)
-            Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(3)
+            Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(4)
             command.Parameters(0).Value = CType(control_id,Integer)
             If (spaltenname Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("spaltenname")
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd
index b2ad97a..6584515 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd
@@ -1925,6 +1925,15 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                   </DbCommand>
                 </UpdateCommand>
               </DbSource>
+              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillAll" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataAll" GeneratorSourceName="FillAll" GetMethodModifier="Public" GetMethodName="GetDataAll" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataAll" UserSourceName="FillAll">
+                <SelectCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>SELECT       *
+FROM            TBPM_CONTROL_TABLE</CommandText>
+                    <Parameters />
+                  </DbCommand>
+                </SelectCommand>
+              </DbSource>
               <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="DD_DMS.dbo.TBPM_CONTROL_TABLE" DbObjectType="Table" FillMethodModifier="Public" FillMethodName="FillByGUID" GenerateMethods="Both" GenerateShortCommands="true" GeneratorGetMethodName="GetDataByGUID" GeneratorSourceName="FillByGUID" GetMethodModifier="Public" GetMethodName="GetDataByGUID" QueryType="Rowset" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataByGUID" UserSourceName="FillByGUID">
                 <SelectCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
@@ -1959,7 +1968,7 @@ WHERE        (GUID = @GUID)</CommandText>
   <xs:element name="DD_DMSLiteDataSet" msdata:IsDataSet="true" msdata:UseCurrentLocale="true" msprop:EnableTableAdapterManager="True" msprop:Generator_DataSetName="DD_DMSLiteDataSet" msprop:Generator_UserDSName="DD_DMSLiteDataSet">
     <xs:complexType>
       <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TableClassName="TBPM_PROFILE_FINAL_INDEXINGDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowChangedName="TBPM_PROFILE_FINAL_INDEXINGRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowDeletingName="TBPM_PROFILE_FINAL_INDEXINGRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FINAL_INDEXINGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FINAL_INDEXINGRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_FINAL_INDEXINGRow" msprop:Generator_UserTableName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowEvArgName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent">
+        <xs:element name="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TableClassName="TBPM_PROFILE_FINAL_INDEXINGDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FINAL_INDEXING" msprop:Generator_TablePropName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowDeletingName="TBPM_PROFILE_FINAL_INDEXINGRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FINAL_INDEXINGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FINAL_INDEXINGRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_FINAL_INDEXING" msprop:Generator_RowChangedName="TBPM_PROFILE_FINAL_INDEXINGRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_FINAL_INDEXINGRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_FINAL_INDEXINGRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="INDEXNAME" msprop:Generator_ColumnVarNameInTable="columnINDEXNAME" msprop:Generator_ColumnPropNameInRow="INDEXNAME" msprop:Generator_ColumnPropNameInTable="INDEXNAMEColumn" msprop:Generator_UserColumnName="INDEXNAME">
@@ -2004,7 +2013,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPM_PROFILE_USER" msprop:Generator_TableClassName="VWPM_PROFILE_USERDataTable" msprop:Generator_TableVarName="tableVWPM_PROFILE_USER" msprop:Generator_RowChangedName="VWPM_PROFILE_USERRowChanged" msprop:Generator_TablePropName="VWPM_PROFILE_USER" msprop:Generator_RowDeletingName="VWPM_PROFILE_USERRowDeleting" msprop:Generator_RowChangingName="VWPM_PROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="VWPM_PROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_PROFILE_USERRowDeleted" msprop:Generator_RowClassName="VWPM_PROFILE_USERRow" msprop:Generator_UserTableName="VWPM_PROFILE_USER" msprop:Generator_RowEvArgName="VWPM_PROFILE_USERRowChangeEvent">
+        <xs:element name="VWPM_PROFILE_USER" msprop:Generator_TableClassName="VWPM_PROFILE_USERDataTable" msprop:Generator_TableVarName="tableVWPM_PROFILE_USER" msprop:Generator_TablePropName="VWPM_PROFILE_USER" msprop:Generator_RowDeletingName="VWPM_PROFILE_USERRowDeleting" msprop:Generator_RowChangingName="VWPM_PROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="VWPM_PROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_PROFILE_USERRowDeleted" msprop:Generator_UserTableName="VWPM_PROFILE_USER" msprop:Generator_RowChangedName="VWPM_PROFILE_USERRowChanged" msprop:Generator_RowEvArgName="VWPM_PROFILE_USERRowChangeEvent" msprop:Generator_RowClassName="VWPM_PROFILE_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="PROFIL_ID" msprop:Generator_ColumnVarNameInTable="columnPROFIL_ID" msprop:Generator_ColumnPropNameInRow="PROFIL_ID" msprop:Generator_ColumnPropNameInTable="PROFIL_IDColumn" msprop:Generator_UserColumnName="PROFIL_ID" type="xs:int" />
@@ -2107,7 +2116,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_KONFIGURATION" msprop:Generator_TableClassName="TBPM_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPM_KONFIGURATION" msprop:Generator_RowChangedName="TBPM_KONFIGURATIONRowChanged" msprop:Generator_TablePropName="TBPM_KONFIGURATION" msprop:Generator_RowDeletingName="TBPM_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPM_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_KONFIGURATIONRowDeleted" msprop:Generator_RowClassName="TBPM_KONFIGURATIONRow" msprop:Generator_UserTableName="TBPM_KONFIGURATION" msprop:Generator_RowEvArgName="TBPM_KONFIGURATIONRowChangeEvent">
+        <xs:element name="TBPM_KONFIGURATION" msprop:Generator_TableClassName="TBPM_KONFIGURATIONDataTable" msprop:Generator_TableVarName="tableTBPM_KONFIGURATION" msprop:Generator_TablePropName="TBPM_KONFIGURATION" msprop:Generator_RowDeletingName="TBPM_KONFIGURATIONRowDeleting" msprop:Generator_RowChangingName="TBPM_KONFIGURATIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_KONFIGURATIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_KONFIGURATIONRowDeleted" msprop:Generator_UserTableName="TBPM_KONFIGURATION" msprop:Generator_RowChangedName="TBPM_KONFIGURATIONRowChanged" msprop:Generator_RowEvArgName="TBPM_KONFIGURATIONRowChangeEvent" msprop:Generator_RowClassName="TBPM_KONFIGURATIONRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:unsignedByte" />
@@ -2203,7 +2212,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_RowClassName="TBDD_USERRow" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent">
+        <xs:element name="TBDD_USER" msprop:Generator_TableClassName="TBDD_USERDataTable" msprop:Generator_TableVarName="tableTBDD_USER" msprop:Generator_TablePropName="TBDD_USER" msprop:Generator_RowDeletingName="TBDD_USERRowDeleting" msprop:Generator_RowChangingName="TBDD_USERRowChanging" msprop:Generator_RowEvHandlerName="TBDD_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBDD_USERRowDeleted" msprop:Generator_UserTableName="TBDD_USER" msprop:Generator_RowChangedName="TBDD_USERRowChanged" msprop:Generator_RowEvArgName="TBDD_USERRowChangeEvent" msprop:Generator_RowClassName="TBDD_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2266,7 +2275,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_TYPE" msprop:Generator_TableClassName="TBPM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPM_TYPE" msprop:Generator_RowChangedName="TBPM_TYPERowChanged" msprop:Generator_TablePropName="TBPM_TYPE" msprop:Generator_RowDeletingName="TBPM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_TYPERowDeleted" msprop:Generator_RowClassName="TBPM_TYPERow" msprop:Generator_UserTableName="TBPM_TYPE" msprop:Generator_RowEvArgName="TBPM_TYPERowChangeEvent">
+        <xs:element name="TBPM_TYPE" msprop:Generator_TableClassName="TBPM_TYPEDataTable" msprop:Generator_TableVarName="tableTBPM_TYPE" msprop:Generator_TablePropName="TBPM_TYPE" msprop:Generator_RowDeletingName="TBPM_TYPERowDeleting" msprop:Generator_RowChangingName="TBPM_TYPERowChanging" msprop:Generator_RowEvHandlerName="TBPM_TYPERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_TYPERowDeleted" msprop:Generator_UserTableName="TBPM_TYPE" msprop:Generator_RowChangedName="TBPM_TYPERowChanged" msprop:Generator_RowEvArgName="TBPM_TYPERowChangeEvent" msprop:Generator_RowClassName="TBPM_TYPERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2296,7 +2305,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_ERROR_LOG" msprop:Generator_TableClassName="TBPM_ERROR_LOGDataTable" msprop:Generator_TableVarName="tableTBPM_ERROR_LOG" msprop:Generator_RowChangedName="TBPM_ERROR_LOGRowChanged" msprop:Generator_TablePropName="TBPM_ERROR_LOG" msprop:Generator_RowDeletingName="TBPM_ERROR_LOGRowDeleting" msprop:Generator_RowChangingName="TBPM_ERROR_LOGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_ERROR_LOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_ERROR_LOGRowDeleted" msprop:Generator_RowClassName="TBPM_ERROR_LOGRow" msprop:Generator_UserTableName="TBPM_ERROR_LOG" msprop:Generator_RowEvArgName="TBPM_ERROR_LOGRowChangeEvent">
+        <xs:element name="TBPM_ERROR_LOG" msprop:Generator_TableClassName="TBPM_ERROR_LOGDataTable" msprop:Generator_TableVarName="tableTBPM_ERROR_LOG" msprop:Generator_TablePropName="TBPM_ERROR_LOG" msprop:Generator_RowDeletingName="TBPM_ERROR_LOGRowDeleting" msprop:Generator_RowChangingName="TBPM_ERROR_LOGRowChanging" msprop:Generator_RowEvHandlerName="TBPM_ERROR_LOGRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_ERROR_LOGRowDeleted" msprop:Generator_UserTableName="TBPM_ERROR_LOG" msprop:Generator_RowChangedName="TBPM_ERROR_LOGRowChanged" msprop:Generator_RowEvArgName="TBPM_ERROR_LOGRowChangeEvent" msprop:Generator_RowClassName="TBPM_ERROR_LOGRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2319,7 +2328,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="VWPM_CONTROL_INDEX" msprop:Generator_TableClassName="VWPM_CONTROL_INDEXDataTable" msprop:Generator_TableVarName="tableVWPM_CONTROL_INDEX" msprop:Generator_RowChangedName="VWPM_CONTROL_INDEXRowChanged" msprop:Generator_TablePropName="VWPM_CONTROL_INDEX" msprop:Generator_RowDeletingName="VWPM_CONTROL_INDEXRowDeleting" msprop:Generator_RowChangingName="VWPM_CONTROL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="VWPM_CONTROL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_CONTROL_INDEXRowDeleted" msprop:Generator_RowClassName="VWPM_CONTROL_INDEXRow" msprop:Generator_UserTableName="VWPM_CONTROL_INDEX" msprop:Generator_RowEvArgName="VWPM_CONTROL_INDEXRowChangeEvent">
+        <xs:element name="VWPM_CONTROL_INDEX" msprop:Generator_TableClassName="VWPM_CONTROL_INDEXDataTable" msprop:Generator_TableVarName="tableVWPM_CONTROL_INDEX" msprop:Generator_TablePropName="VWPM_CONTROL_INDEX" msprop:Generator_RowDeletingName="VWPM_CONTROL_INDEXRowDeleting" msprop:Generator_RowChangingName="VWPM_CONTROL_INDEXRowChanging" msprop:Generator_RowEvHandlerName="VWPM_CONTROL_INDEXRowChangeEventHandler" msprop:Generator_RowDeletedName="VWPM_CONTROL_INDEXRowDeleted" msprop:Generator_UserTableName="VWPM_CONTROL_INDEX" msprop:Generator_RowChangedName="VWPM_CONTROL_INDEXRowChanged" msprop:Generator_RowEvArgName="VWPM_CONTROL_INDEXRowChangeEvent" msprop:Generator_RowClassName="VWPM_CONTROL_INDEXRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2408,7 +2417,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_CONNECTION" msprop:Generator_TableClassName="TBPM_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBPM_CONNECTION" msprop:Generator_RowChangedName="TBPM_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBPM_CONNECTION" msprop:Generator_RowDeletingName="TBPM_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBPM_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBPM_CONNECTIONRow" msprop:Generator_UserTableName="TBPM_CONNECTION" msprop:Generator_RowEvArgName="TBPM_CONNECTIONRowChangeEvent">
+        <xs:element name="TBPM_CONNECTION" msprop:Generator_TableClassName="TBPM_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBPM_CONNECTION" msprop:Generator_TablePropName="TBPM_CONNECTION" msprop:Generator_RowDeletingName="TBPM_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBPM_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBPM_CONNECTION" msprop:Generator_RowChangedName="TBPM_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBPM_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBPM_CONNECTIONRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2481,7 +2490,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPROFILE_USER" msprop:Generator_TableClassName="TBPROFILE_USERDataTable" msprop:Generator_TableVarName="tableTBPROFILE_USER" msprop:Generator_RowChangedName="TBPROFILE_USERRowChanged" msprop:Generator_TablePropName="TBPROFILE_USER" msprop:Generator_RowDeletingName="TBPROFILE_USERRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_USERRowDeleted" msprop:Generator_RowClassName="TBPROFILE_USERRow" msprop:Generator_UserTableName="TBPROFILE_USER" msprop:Generator_RowEvArgName="TBPROFILE_USERRowChangeEvent">
+        <xs:element name="TBPROFILE_USER" msprop:Generator_TableClassName="TBPROFILE_USERDataTable" msprop:Generator_TableVarName="tableTBPROFILE_USER" msprop:Generator_TablePropName="TBPROFILE_USER" msprop:Generator_RowDeletingName="TBPROFILE_USERRowDeleting" msprop:Generator_RowChangingName="TBPROFILE_USERRowChanging" msprop:Generator_RowEvHandlerName="TBPROFILE_USERRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPROFILE_USERRowDeleted" msprop:Generator_UserTableName="TBPROFILE_USER" msprop:Generator_RowChangedName="TBPROFILE_USERRowChanged" msprop:Generator_RowEvArgName="TBPROFILE_USERRowChangeEvent" msprop:Generator_RowClassName="TBPROFILE_USERRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2517,7 +2526,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE_FILES" msprop:Generator_TableClassName="TBPM_PROFILE_FILESDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FILES" msprop:Generator_RowChangedName="TBPM_PROFILE_FILESRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_FILES" msprop:Generator_RowDeletingName="TBPM_PROFILE_FILESRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FILESRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FILESRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_FILESRow" msprop:Generator_UserTableName="TBPM_PROFILE_FILES" msprop:Generator_RowEvArgName="TBPM_PROFILE_FILESRowChangeEvent">
+        <xs:element name="TBPM_PROFILE_FILES" msprop:Generator_TableClassName="TBPM_PROFILE_FILESDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_FILES" msprop:Generator_TablePropName="TBPM_PROFILE_FILES" msprop:Generator_RowDeletingName="TBPM_PROFILE_FILESRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_FILESRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_FILESRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_FILESRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_FILES" msprop:Generator_RowChangedName="TBPM_PROFILE_FILESRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_FILESRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_FILESRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2532,7 +2541,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_TableClassName="TBPM_FILES_USER_NOT_INDEXEDDataTable" msprop:Generator_TableVarName="tableTBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowChangedName="TBPM_FILES_USER_NOT_INDEXEDRowChanged" msprop:Generator_TablePropName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowDeletingName="TBPM_FILES_USER_NOT_INDEXEDRowDeleting" msprop:Generator_RowChangingName="TBPM_FILES_USER_NOT_INDEXEDRowChanging" msprop:Generator_RowEvHandlerName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_FILES_USER_NOT_INDEXEDRowDeleted" msprop:Generator_RowClassName="TBPM_FILES_USER_NOT_INDEXEDRow" msprop:Generator_UserTableName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowEvArgName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent">
+        <xs:element name="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_TableClassName="TBPM_FILES_USER_NOT_INDEXEDDataTable" msprop:Generator_TableVarName="tableTBPM_FILES_USER_NOT_INDEXED" msprop:Generator_TablePropName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowDeletingName="TBPM_FILES_USER_NOT_INDEXEDRowDeleting" msprop:Generator_RowChangingName="TBPM_FILES_USER_NOT_INDEXEDRowChanging" msprop:Generator_RowEvHandlerName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_FILES_USER_NOT_INDEXEDRowDeleted" msprop:Generator_UserTableName="TBPM_FILES_USER_NOT_INDEXED" msprop:Generator_RowChangedName="TBPM_FILES_USER_NOT_INDEXEDRowChanged" msprop:Generator_RowEvArgName="TBPM_FILES_USER_NOT_INDEXEDRowChangeEvent" msprop:Generator_RowClassName="TBPM_FILES_USER_NOT_INDEXEDRow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="USR_NAME" msprop:Generator_ColumnVarNameInTable="columnUSR_NAME" msprop:Generator_ColumnPropNameInRow="USR_NAME" msprop:Generator_ColumnPropNameInTable="USR_NAMEColumn" msprop:Generator_UserColumnName="USR_NAME" minOccurs="0">
@@ -2553,7 +2562,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE" msprop:Generator_TableClassName="TBPM_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE" msprop:Generator_RowChangedName="TBPM_PROFILERowChanged" msprop:Generator_TablePropName="TBPM_PROFILE" msprop:Generator_RowDeletingName="TBPM_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILERowDeleted" msprop:Generator_RowClassName="TBPM_PROFILERow" msprop:Generator_UserTableName="TBPM_PROFILE" msprop:Generator_RowEvArgName="TBPM_PROFILERowChangeEvent">
+        <xs:element name="TBPM_PROFILE" msprop:Generator_TableClassName="TBPM_PROFILEDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE" msprop:Generator_TablePropName="TBPM_PROFILE" msprop:Generator_RowDeletingName="TBPM_PROFILERowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILERowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILERowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE" msprop:Generator_RowChangedName="TBPM_PROFILERowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILERowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILERow">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2661,7 +2670,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_CONNECTION" msprop:Generator_TableClassName="TBWH_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBWH_CONNECTION" msprop:Generator_TablePropName="TBWH_CONNECTION" msprop:Generator_RowDeletingName="TBWH_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBWH_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CONNECTIONRowDeleted" msprop:Generator_UserTableName="TBWH_CONNECTION" msprop:Generator_RowChangedName="TBWH_CONNECTIONRowChanged" msprop:Generator_RowEvArgName="TBWH_CONNECTIONRowChangeEvent" msprop:Generator_RowClassName="TBWH_CONNECTIONRow">
+        <xs:element name="TBWH_CONNECTION" msprop:Generator_TableClassName="TBWH_CONNECTIONDataTable" msprop:Generator_TableVarName="tableTBWH_CONNECTION" msprop:Generator_RowChangedName="TBWH_CONNECTIONRowChanged" msprop:Generator_TablePropName="TBWH_CONNECTION" msprop:Generator_RowDeletingName="TBWH_CONNECTIONRowDeleting" msprop:Generator_RowChangingName="TBWH_CONNECTIONRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CONNECTIONRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CONNECTIONRowDeleted" msprop:Generator_RowClassName="TBWH_CONNECTIONRow" msprop:Generator_UserTableName="TBWH_CONNECTION" msprop:Generator_RowEvArgName="TBWH_CONNECTIONRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:short" />
@@ -2734,7 +2743,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBWH_CHECK_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TablePropName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBWH_CHECK_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBWH_CHECK_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CHECK_PROFILE_CONTROLSRowDeleted" msprop:Generator_UserTableName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBWH_CHECK_PROFILE_CONTROLSRowChanged" msprop:Generator_RowEvArgName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEvent" msprop:Generator_RowClassName="TBWH_CHECK_PROFILE_CONTROLSRow">
+        <xs:element name="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBWH_CHECK_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBWH_CHECK_PROFILE_CONTROLSRowChanged" msprop:Generator_TablePropName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBWH_CHECK_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBWH_CHECK_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBWH_CHECK_PROFILE_CONTROLSRowDeleted" msprop:Generator_RowClassName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_UserTableName="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_RowEvArgName="TBWH_CHECK_PROFILE_CONTROLSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msdata:AutoIncrementSeed="-1" msdata:AutoIncrementStep="-1" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2785,7 +2794,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBPM_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_CONTROLS" msprop:Generator_TablePropName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBPM_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_CONTROLSRowDeleted" msprop:Generator_UserTableName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBPM_PROFILE_CONTROLSRowChanged" msprop:Generator_RowEvArgName="TBPM_PROFILE_CONTROLSRowChangeEvent" msprop:Generator_RowClassName="TBPM_PROFILE_CONTROLSRow">
+        <xs:element name="TBPM_PROFILE_CONTROLS" msprop:Generator_TableClassName="TBPM_PROFILE_CONTROLSDataTable" msprop:Generator_TableVarName="tableTBPM_PROFILE_CONTROLS" msprop:Generator_RowChangedName="TBPM_PROFILE_CONTROLSRowChanged" msprop:Generator_TablePropName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowDeletingName="TBPM_PROFILE_CONTROLSRowDeleting" msprop:Generator_RowChangingName="TBPM_PROFILE_CONTROLSRowChanging" msprop:Generator_RowEvHandlerName="TBPM_PROFILE_CONTROLSRowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_PROFILE_CONTROLSRowDeleted" msprop:Generator_RowClassName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_UserTableName="TBPM_PROFILE_CONTROLS" msprop:Generator_RowEvArgName="TBPM_PROFILE_CONTROLSRowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -2876,7 +2885,7 @@ WHERE        (GUID = @GUID)</CommandText>
             </xs:sequence>
           </xs:complexType>
         </xs:element>
-        <xs:element name="TBPM_CONTROL_TABLE" msprop:Generator_TableClassName="TBPM_CONTROL_TABLEDataTable" msprop:Generator_TableVarName="tableTBPM_CONTROL_TABLE" msprop:Generator_TablePropName="TBPM_CONTROL_TABLE" msprop:Generator_RowDeletingName="TBPM_CONTROL_TABLERowDeleting" msprop:Generator_RowChangingName="TBPM_CONTROL_TABLERowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONTROL_TABLERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONTROL_TABLERowDeleted" msprop:Generator_UserTableName="TBPM_CONTROL_TABLE" msprop:Generator_RowChangedName="TBPM_CONTROL_TABLERowChanged" msprop:Generator_RowEvArgName="TBPM_CONTROL_TABLERowChangeEvent" msprop:Generator_RowClassName="TBPM_CONTROL_TABLERow">
+        <xs:element name="TBPM_CONTROL_TABLE" msprop:Generator_TableClassName="TBPM_CONTROL_TABLEDataTable" msprop:Generator_TableVarName="tableTBPM_CONTROL_TABLE" msprop:Generator_RowChangedName="TBPM_CONTROL_TABLERowChanged" msprop:Generator_TablePropName="TBPM_CONTROL_TABLE" msprop:Generator_RowDeletingName="TBPM_CONTROL_TABLERowDeleting" msprop:Generator_RowChangingName="TBPM_CONTROL_TABLERowChanging" msprop:Generator_RowEvHandlerName="TBPM_CONTROL_TABLERowChangeEventHandler" msprop:Generator_RowDeletedName="TBPM_CONTROL_TABLERowDeleted" msprop:Generator_RowClassName="TBPM_CONTROL_TABLERow" msprop:Generator_UserTableName="TBPM_CONTROL_TABLE" msprop:Generator_RowEvArgName="TBPM_CONTROL_TABLERowChangeEvent">
           <xs:complexType>
             <xs:sequence>
               <xs:element name="GUID" msdata:ReadOnly="true" msdata:AutoIncrement="true" msprop:Generator_ColumnVarNameInTable="columnGUID" msprop:Generator_ColumnPropNameInRow="GUID" msprop:Generator_ColumnPropNameInTable="GUIDColumn" msprop:Generator_UserColumnName="GUID" type="xs:int" />
@@ -3007,11 +3016,11 @@ WHERE        (GUID = @GUID)</CommandText>
   </xs:element>
   <xs:annotation>
     <xs:appinfo>
-      <msdata:Relationship name="FK_TBPM_ERROR_LOG_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_ERROR_LOG" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_ERROR_LOG" msprop:Generator_ChildPropName="GetTBPM_ERROR_LOGRows" msprop:Generator_UserRelationName="FK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" />
-      <msdata:Relationship name="FK_TBPM_PROFILE_TYPE1" msdata:parent="TBPM_TYPE" msdata:child="TBPM_PROFILE" msdata:parentkey="GUID" msdata:childkey="TYPE" msprop:Generator_UserChildTable="TBPM_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILERows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_TYPE1" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_TYPE1" msprop:Generator_UserParentTable="TBPM_TYPE" msprop:Generator_ParentPropName="TBPM_TYPERow" />
-      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_ParentPropName="TBPM_PROFILERow" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" />
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" />
-      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" />
+      <msdata:Relationship name="FK_TBPM_ERROR_LOG_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_ERROR_LOG" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_ERROR_LOG" msprop:Generator_ChildPropName="GetTBPM_ERROR_LOGRows" msprop:Generator_UserRelationName="FK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_RelationVarName="relationFK_TBPM_ERROR_LOG_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
+      <msdata:Relationship name="FK_TBPM_PROFILE_TYPE1" msdata:parent="TBPM_TYPE" msdata:child="TBPM_PROFILE" msdata:parentkey="GUID" msdata:childkey="TYPE" msprop:Generator_UserChildTable="TBPM_PROFILE" msprop:Generator_ChildPropName="GetTBPM_PROFILERows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_TYPE1" msprop:Generator_ParentPropName="TBPM_TYPERow" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_TYPE1" msprop:Generator_UserParentTable="TBPM_TYPE" />
+      <msdata:Relationship name="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msdata:parent="TBPM_PROFILE" msdata:child="TBPM_PROFILE_CONTROLS" msdata:parentkey="GUID" msdata:childkey="PROFIL_ID" msprop:Generator_UserChildTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ChildPropName="GetTBPM_PROFILE_CONTROLSRows" msprop:Generator_UserRelationName="FK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_RelationVarName="relationFK_TBPM_PROFILE_CONTROLS_PROFILE1" msprop:Generator_UserParentTable="TBPM_PROFILE" msprop:Generator_ParentPropName="TBPM_PROFILERow" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL1" msdata:parent="TBPM_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL1" msprop:Generator_UserParentTable="TBPM_PROFILE_CONTROLS" msprop:Generator_ParentPropName="TBPM_PROFILE_CONTROLSRow" />
+      <msdata:Relationship name="FK_TBPM_CONTROL_TABLE_CONTROL" msdata:parent="TBWH_CHECK_PROFILE_CONTROLS" msdata:child="TBPM_CONTROL_TABLE" msdata:parentkey="GUID" msdata:childkey="CONTROL_ID" msprop:Generator_UserChildTable="TBPM_CONTROL_TABLE" msprop:Generator_ChildPropName="GetTBPM_CONTROL_TABLERows" msprop:Generator_UserRelationName="FK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_ParentPropName="TBWH_CHECK_PROFILE_CONTROLSRow" msprop:Generator_RelationVarName="relationFK_TBPM_CONTROL_TABLE_CONTROL" msprop:Generator_UserParentTable="TBWH_CHECK_PROFILE_CONTROLS" />
     </xs:appinfo>
   </xs:annotation>
 </xs:schema>
\ No newline at end of file
diff --git a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss
index 1669183..fb01cd3 100644
--- a/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss
+++ b/app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss
@@ -20,7 +20,7 @@
     <Shape ID="DesignTable:TBPM_PROFILE" ZOrder="17" X="255" Y="387" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBWH_CHECK_PROFILE_CONTROLS" ZOrder="12" X="0" Y="-72" Height="168" Width="158" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="78" />
     <Shape ID="DesignTable:TBPM_PROFILE_CONTROLS" ZOrder="10" X="595" Y="421" Height="476" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
-    <Shape ID="DesignTable:TBPM_CONTROL_TABLE" ZOrder="5" X="940" Y="517" Height="324" Width="284" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="254" />
+    <Shape ID="DesignTable:TBPM_CONTROL_TABLE" ZOrder="5" X="861" Y="110" Height="381" Width="300" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="24" OldDataTableHeight="0" SplitterPosition="254" />
     <Shape ID="DesignTable:TBWH_CONNECTION" ZOrder="13" X="625" Y="114" Height="276" Width="189" AdapterExpanded="true" DataTableExpanded="true" OldAdapterHeight="0" OldDataTableHeight="0" SplitterPosition="272" />
   </Shapes>
   <Connectors>
@@ -63,32 +63,32 @@
     <Connector ID="DesignRelation:FK_TBPM_CONTROL_TABLE_CONTROL1" ZOrder="9" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>895</X>
-          <Y>565</Y>
+          <X>844</X>
+          <Y>421</Y>
         </Point>
         <Point>
-          <X>940</X>
-          <Y>565</Y>
+          <X>844</X>
+          <Y>394</Y>
+        </Point>
+        <Point>
+          <X>861</X>
+          <Y>394</Y>
         </Point>
       </RoutePoints>
     </Connector>
     <Connector ID="DesignRelation:FK_TBPM_CONTROL_TABLE_CONTROL" ZOrder="8" LineWidth="11">
       <RoutePoints>
         <Point>
-          <X>118</X>
-          <Y>0</Y>
-        </Point>
-        <Point>
-          <X>118</X>
-          <Y>-30</Y>
+          <X>141</X>
+          <Y>96</Y>
         </Point>
         <Point>
-          <X>118</X>
-          <Y>-30</Y>
+          <X>141</X>
+          <Y>127</Y>
         </Point>
         <Point>
-          <X>118</X>
-          <Y>0</Y>
+          <X>861</X>
+          <Y>127</Y>
         </Point>
       </RoutePoints>
     </Connector>
diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
index d8beaa7..e23fb6e 100644
--- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
+++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
@@ -154,6 +154,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ClassAnnotation.vb" />
+    <Compile Include="ClassControlCreator.vb" />
     <Compile Include="ClassInit.vb" />
     <Compile Include="ClassLogger.vb" />
     <Compile Include="ClassSQLEditor.vb" />
diff --git a/app/DD_PM_WINDREAM/ModuleControlProperties.vb b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
index 626cce7..927efe9 100644
--- a/app/DD_PM_WINDREAM/ModuleControlProperties.vb
+++ b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
@@ -15,6 +15,30 @@ Public Module ModuleControlProperties
         Private _size As Size
         Private _font As Font
         Private _text_color As Color
+        Private _changed_at As Date
+        Private _changed_who As String
+
+        <Category("Allgemein")>
+        <[ReadOnly](True)>
+        Public Property ChangedAt As Date
+            Get
+                Return _changed_at
+            End Get
+            Set(value As Date)
+                _changed_at = value
+            End Set
+        End Property
+
+        <Category("Allgemein")>
+        <[ReadOnly](True)>
+        Public Property ChangedWho As String
+            Get
+                Return _changed_who
+            End Get
+            Set(value As String)
+                _changed_who = value
+            End Set
+        End Property
 
         <Category("Allgemein")>
         <[ReadOnly](True)>
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
index 33db3c8..f2e3e25 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
@@ -29,12 +29,39 @@ Partial Class frmFormDesigner
         Me.Panel1 = New System.Windows.Forms.Panel()
         Me.lblDesign = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.btnTabelle = New System.Windows.Forms.Button()
+        Me.btnCheckbox = New System.Windows.Forms.Button()
+        Me.btnVektor = New System.Windows.Forms.Button()
+        Me.btndtp = New System.Windows.Forms.Button()
+        Me.btncmb = New System.Windows.Forms.Button()
+        Me.btntextbox = New System.Windows.Forms.Button()
+        Me.btnlabel = New System.Windows.Forms.Button()
         Me.pnldesigner = New System.Windows.Forms.Panel()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.lblhintergrund = New System.Windows.Forms.Label()
         Me.gbxControl = New System.Windows.Forms.GroupBox()
         Me.TabControlEigenschaften = New System.Windows.Forms.TabControl()
-        Me.TabPage1 = New System.Windows.Forms.TabPage()
+        Me.pageProperties = New System.Windows.Forms.TabPage()
+        Me.pgControls = New System.Windows.Forms.PropertyGrid()
+        Me.pageFormat = New System.Windows.Forms.TabPage()
+        Me.btnheight_minus = New System.Windows.Forms.Button()
+        Me.btnheight_plus = New System.Windows.Forms.Button()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Label2 = New System.Windows.Forms.Label()
+        Me.btnwidth_minus = New System.Windows.Forms.Button()
+        Me.btnwidth_plus = New System.Windows.Forms.Button()
+        Me.pageSQL = New System.Windows.Forms.TabPage()
+        Me.pnlAuswahlliste = New System.Windows.Forms.Panel()
+        Me.btnEditor = New System.Windows.Forms.Button()
+        Me.btnShowConnections = New System.Windows.Forms.Button()
+        Me.SQL_CommandTextBox = New System.Windows.Forms.TextBox()
+        Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet()
+        Me.Label5 = New System.Windows.Forms.Label()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.cmbConnection = New System.Windows.Forms.ComboBox()
+        Me.TBPM_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
+        Me.pagePropertiesOld = New System.Windows.Forms.TabPage()
         Me.LOAD_IDX_VALUECheckBox = New System.Windows.Forms.CheckBox()
         Me.READ_ONLYCheckBox = New System.Windows.Forms.CheckBox()
         Me.INDEX_NAME_VALUE = New System.Windows.Forms.TextBox()
@@ -51,41 +78,14 @@ Partial Class frmFormDesigner
         Me.CheckBoxAuswahlliste = New System.Windows.Forms.CheckBox()
         Me.lblAuswahlliste = New System.Windows.Forms.Label()
         Me.INDEX_NAMETextBox = New System.Windows.Forms.TextBox()
-        Me.TabPage2 = New System.Windows.Forms.TabPage()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
-        Me.TabPage3 = New System.Windows.Forms.TabPage()
-        Me.pnlAuswahlliste = New System.Windows.Forms.Panel()
-        Me.SQL_CommandTextBox = New System.Windows.Forms.TextBox()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.cmbConnection = New System.Windows.Forms.ComboBox()
-        Me.TabPage4 = New System.Windows.Forms.TabPage()
-        Me.pgControls = New System.Windows.Forms.PropertyGrid()
+        Me.btndelete = New System.Windows.Forms.Button()
+        Me.btnsave = New System.Windows.Forms.Button()
         Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox()
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
+        Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel()
         Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox()
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
-        Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet()
         Me.btnrefresh = New System.Windows.Forms.Button()
-        Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.btnheight_minus = New System.Windows.Forms.Button()
-        Me.btnheight_plus = New System.Windows.Forms.Button()
-        Me.btnwidth_minus = New System.Windows.Forms.Button()
-        Me.btnwidth_plus = New System.Windows.Forms.Button()
-        Me.btnEditor = New System.Windows.Forms.Button()
-        Me.btnShowConnections = New System.Windows.Forms.Button()
-        Me.TBPM_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.btndelete = New System.Windows.Forms.Button()
-        Me.btnsave = New System.Windows.Forms.Button()
-        Me.btnTabelle = New System.Windows.Forms.Button()
-        Me.btnCheckbox = New System.Windows.Forms.Button()
-        Me.btnVektor = New System.Windows.Forms.Button()
-        Me.btndtp = New System.Windows.Forms.Button()
-        Me.btncmb = New System.Windows.Forms.Button()
-        Me.btntextbox = New System.Windows.Forms.Button()
-        Me.btnlabel = New System.Windows.Forms.Button()
         Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter()
         Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
         Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter()
@@ -100,15 +100,15 @@ Partial Class frmFormDesigner
         Me.pnldesigner.SuspendLayout()
         Me.gbxControl.SuspendLayout()
         Me.TabControlEigenschaften.SuspendLayout()
-        Me.TabPage1.SuspendLayout()
-        Me.TabPage2.SuspendLayout()
-        Me.TabPage3.SuspendLayout()
+        Me.pageProperties.SuspendLayout()
+        Me.pageFormat.SuspendLayout()
+        Me.pageSQL.SuspendLayout()
         Me.pnlAuswahlliste.SuspendLayout()
-        Me.TabPage4.SuspendLayout()
-        Me.StatusStrip1.SuspendLayout()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.pagePropertiesOld.SuspendLayout()
+        Me.StatusStrip1.SuspendLayout()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
@@ -172,6 +172,97 @@ Partial Class frmFormDesigner
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Control-Typ (Drag and Drop)"
         '
+        'btnTabelle
+        '
+        Me.btnTabelle.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnTabelle.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.table_add
+        Me.btnTabelle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnTabelle.Location = New System.Drawing.Point(290, 55)
+        Me.btnTabelle.Name = "btnTabelle"
+        Me.btnTabelle.Size = New System.Drawing.Size(103, 29)
+        Me.btnTabelle.TabIndex = 6
+        Me.btnTabelle.Text = "Tabelle"
+        Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnTabelle.UseVisualStyleBackColor = True
+        '
+        'btnCheckbox
+        '
+        Me.btnCheckbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnCheckbox.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.checkbox_16xLG
+        Me.btnCheckbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnCheckbox.Location = New System.Drawing.Point(151, 90)
+        Me.btnCheckbox.Name = "btnCheckbox"
+        Me.btnCheckbox.Size = New System.Drawing.Size(133, 31)
+        Me.btnCheckbox.TabIndex = 5
+        Me.btnCheckbox.Text = "Checkbox"
+        Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnCheckbox.UseVisualStyleBackColor = True
+        '
+        'btnVektor
+        '
+        Me.btnVektor.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnVektor.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.table_add
+        Me.btnVektor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnVektor.Location = New System.Drawing.Point(151, 55)
+        Me.btnVektor.Name = "btnVektor"
+        Me.btnVektor.Size = New System.Drawing.Size(133, 29)
+        Me.btnVektor.TabIndex = 4
+        Me.btnVektor.Text = "Mehrfach-/Vektorfeld"
+        Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnVektor.UseVisualStyleBackColor = True
+        '
+        'btndtp
+        '
+        Me.btndtp.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btndtp.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.DateOrTimePicker_675
+        Me.btndtp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btndtp.Location = New System.Drawing.Point(151, 22)
+        Me.btndtp.Name = "btndtp"
+        Me.btndtp.Size = New System.Drawing.Size(133, 27)
+        Me.btndtp.TabIndex = 3
+        Me.btndtp.Text = "DatePicker"
+        Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btndtp.UseVisualStyleBackColor = True
+        '
+        'btncmb
+        '
+        Me.btncmb.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btncmb.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.ComboBox_16xLG
+        Me.btncmb.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btncmb.Location = New System.Drawing.Point(12, 90)
+        Me.btncmb.Name = "btncmb"
+        Me.btncmb.Size = New System.Drawing.Size(133, 31)
+        Me.btncmb.TabIndex = 2
+        Me.btncmb.Text = "Combobox"
+        Me.btncmb.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btncmb.UseVisualStyleBackColor = True
+        '
+        'btntextbox
+        '
+        Me.btntextbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btntextbox.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.TextBox_708
+        Me.btntextbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btntextbox.Location = New System.Drawing.Point(13, 55)
+        Me.btntextbox.Name = "btntextbox"
+        Me.btntextbox.Size = New System.Drawing.Size(133, 29)
+        Me.btntextbox.TabIndex = 1
+        Me.btntextbox.Text = "Textbox"
+        Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btntextbox.UseVisualStyleBackColor = True
+        '
+        'btnlabel
+        '
+        Me.btnlabel.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnlabel.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Label_684
+        Me.btnlabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnlabel.Location = New System.Drawing.Point(12, 22)
+        Me.btnlabel.Name = "btnlabel"
+        Me.btnlabel.Size = New System.Drawing.Size(133, 27)
+        Me.btnlabel.TabIndex = 0
+        Me.btnlabel.Text = "Label"
+        Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnlabel.UseVisualStyleBackColor = True
+        '
         'pnldesigner
         '
         Me.pnldesigner.AllowDrop = True
@@ -229,261 +320,133 @@ Partial Class frmFormDesigner
         Me.TabControlEigenschaften.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
             Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TabControlEigenschaften.Controls.Add(Me.TabPage1)
-        Me.TabControlEigenschaften.Controls.Add(Me.TabPage2)
-        Me.TabControlEigenschaften.Controls.Add(Me.TabPage3)
-        Me.TabControlEigenschaften.Controls.Add(Me.TabPage4)
+        Me.TabControlEigenschaften.Controls.Add(Me.pageProperties)
+        Me.TabControlEigenschaften.Controls.Add(Me.pageFormat)
+        Me.TabControlEigenschaften.Controls.Add(Me.pageSQL)
+        Me.TabControlEigenschaften.Controls.Add(Me.pagePropertiesOld)
         Me.TabControlEigenschaften.Location = New System.Drawing.Point(12, 22)
         Me.TabControlEigenschaften.Name = "TabControlEigenschaften"
         Me.TabControlEigenschaften.SelectedIndex = 0
         Me.TabControlEigenschaften.Size = New System.Drawing.Size(455, 263)
         Me.TabControlEigenschaften.TabIndex = 22
         '
-        'TabPage1
-        '
-        Me.TabPage1.AutoScroll = True
-        Me.TabPage1.BackColor = System.Drawing.Color.White
-        Me.TabPage1.Controls.Add(Me.LOAD_IDX_VALUECheckBox)
-        Me.TabPage1.Controls.Add(Me.READ_ONLYCheckBox)
-        Me.TabPage1.Controls.Add(Me.INDEX_NAME_VALUE)
-        Me.TabPage1.Controls.Add(Me.rbVektor)
-        Me.TabPage1.Controls.Add(Me.rbIndex)
-        Me.TabPage1.Controls.Add(Me.lblCtrlName)
-        Me.TabPage1.Controls.Add(Me.CHOICE_LISTTextBox)
-        Me.TabPage1.Controls.Add(Me.lblBeschriftung)
-        Me.TabPage1.Controls.Add(Me.VALIDATIONCheckBox)
-        Me.TabPage1.Controls.Add(Me.lblIndex)
-        Me.TabPage1.Controls.Add(Me.CTRL_TEXTTextBox)
-        Me.TabPage1.Controls.Add(Me.cmbIndex)
-        Me.TabPage1.Controls.Add(Me.NAMETextBox)
-        Me.TabPage1.Controls.Add(Me.CheckBoxAuswahlliste)
-        Me.TabPage1.Controls.Add(Me.lblAuswahlliste)
-        Me.TabPage1.Controls.Add(Me.INDEX_NAMETextBox)
-        Me.TabPage1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TabPage1.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage1.Name = "TabPage1"
-        Me.TabPage1.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage1.Size = New System.Drawing.Size(447, 234)
-        Me.TabPage1.TabIndex = 0
-        Me.TabPage1.Text = "Allgemein"
-        '
-        'LOAD_IDX_VALUECheckBox
+        'pageProperties
         '
-        Me.LOAD_IDX_VALUECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "LOAD_IDX_VALUE", True))
-        Me.LOAD_IDX_VALUECheckBox.Location = New System.Drawing.Point(6, 185)
-        Me.LOAD_IDX_VALUECheckBox.Name = "LOAD_IDX_VALUECheckBox"
-        Me.LOAD_IDX_VALUECheckBox.Size = New System.Drawing.Size(121, 24)
-        Me.LOAD_IDX_VALUECheckBox.TabIndex = 19
-        Me.LOAD_IDX_VALUECheckBox.Text = "Lade Indexdaten"
-        Me.ToolTip1.SetToolTip(Me.LOAD_IDX_VALUECheckBox, "Die im zugrundeliegenden Index gepeicherten" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Daten werden nicht angezeigt")
-        Me.LOAD_IDX_VALUECheckBox.UseVisualStyleBackColor = True
+        Me.pageProperties.Controls.Add(Me.pgControls)
+        Me.pageProperties.Location = New System.Drawing.Point(4, 25)
+        Me.pageProperties.Name = "pageProperties"
+        Me.pageProperties.Padding = New System.Windows.Forms.Padding(3)
+        Me.pageProperties.Size = New System.Drawing.Size(447, 234)
+        Me.pageProperties.TabIndex = 3
+        Me.pageProperties.Text = "Eigenschaften"
+        Me.pageProperties.UseVisualStyleBackColor = True
         '
-        'READ_ONLYCheckBox
+        'pgControls
         '
-        Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "READ_ONLY", True))
-        Me.READ_ONLYCheckBox.Location = New System.Drawing.Point(6, 164)
-        Me.READ_ONLYCheckBox.Name = "READ_ONLYCheckBox"
-        Me.READ_ONLYCheckBox.Size = New System.Drawing.Size(86, 24)
-        Me.READ_ONLYCheckBox.TabIndex = 18
-        Me.READ_ONLYCheckBox.Text = "Read Only"
-        Me.ToolTip1.SetToolTip(Me.READ_ONLYCheckBox, "lässt keine Änderungen am Index zu")
-        Me.READ_ONLYCheckBox.UseVisualStyleBackColor = True
+        Me.pgControls.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.pgControls.HelpVisible = False
+        Me.pgControls.Location = New System.Drawing.Point(3, 3)
+        Me.pgControls.Name = "pgControls"
+        Me.pgControls.Size = New System.Drawing.Size(441, 228)
+        Me.pgControls.TabIndex = 0
         '
-        'INDEX_NAME_VALUE
+        'pageFormat
+        '
+        Me.pageFormat.Controls.Add(Me.btnheight_minus)
+        Me.pageFormat.Controls.Add(Me.btnheight_plus)
+        Me.pageFormat.Controls.Add(Me.Label3)
+        Me.pageFormat.Controls.Add(Me.Label2)
+        Me.pageFormat.Controls.Add(Me.btnwidth_minus)
+        Me.pageFormat.Controls.Add(Me.btnwidth_plus)
+        Me.pageFormat.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.pageFormat.Location = New System.Drawing.Point(4, 25)
+        Me.pageFormat.Name = "pageFormat"
+        Me.pageFormat.Padding = New System.Windows.Forms.Padding(3)
+        Me.pageFormat.Size = New System.Drawing.Size(447, 234)
+        Me.pageFormat.TabIndex = 1
+        Me.pageFormat.Text = "Format"
+        Me.pageFormat.UseVisualStyleBackColor = True
         '
-        Me.INDEX_NAME_VALUE.BackColor = System.Drawing.Color.White
-        Me.INDEX_NAME_VALUE.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.INDEX_NAME_VALUE.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
-        Me.INDEX_NAME_VALUE.ForeColor = System.Drawing.Color.White
-        Me.INDEX_NAME_VALUE.Location = New System.Drawing.Point(334, 142)
-        Me.INDEX_NAME_VALUE.Name = "INDEX_NAME_VALUE"
-        Me.INDEX_NAME_VALUE.ReadOnly = True
-        Me.INDEX_NAME_VALUE.Size = New System.Drawing.Size(51, 16)
-        Me.INDEX_NAME_VALUE.TabIndex = 17
-        Me.INDEX_NAME_VALUE.TabStop = False
+        'btnheight_minus
         '
-        'rbVektor
+        Me.btnheight_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnheight_minus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_out
+        Me.btnheight_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnheight_minus.Location = New System.Drawing.Point(94, 69)
+        Me.btnheight_minus.Name = "btnheight_minus"
+        Me.btnheight_minus.Size = New System.Drawing.Size(75, 25)
+        Me.btnheight_minus.TabIndex = 1
+        Me.btnheight_minus.Text = "kleiner"
+        Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnheight_minus.UseVisualStyleBackColor = True
         '
-        Me.rbVektor.AutoSize = True
-        Me.rbVektor.Location = New System.Drawing.Point(174, 52)
-        Me.rbVektor.Name = "rbVektor"
-        Me.rbVektor.Size = New System.Drawing.Size(225, 20)
-        Me.rbVektor.TabIndex = 15
-        Me.rbVektor.TabStop = True
-        Me.rbVektor.Text = "Benutze Vektor-Feld für Metadaten"
-        Me.rbVektor.UseVisualStyleBackColor = True
-        Me.rbVektor.Visible = False
+        'btnheight_plus
         '
-        'rbIndex
+        Me.btnheight_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnheight_plus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_in
+        Me.btnheight_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnheight_plus.Location = New System.Drawing.Point(13, 69)
+        Me.btnheight_plus.Name = "btnheight_plus"
+        Me.btnheight_plus.Size = New System.Drawing.Size(75, 25)
+        Me.btnheight_plus.TabIndex = 0
+        Me.btnheight_plus.Text = "größer"
+        Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnheight_plus.UseVisualStyleBackColor = True
         '
-        Me.rbIndex.AutoSize = True
-        Me.rbIndex.Location = New System.Drawing.Point(9, 52)
-        Me.rbIndex.Name = "rbIndex"
-        Me.rbIndex.Size = New System.Drawing.Size(159, 20)
-        Me.rbIndex.TabIndex = 14
-        Me.rbIndex.TabStop = True
-        Me.rbIndex.Text = "Beschreibe Index direkt"
-        Me.rbIndex.UseVisualStyleBackColor = True
-        Me.rbIndex.Visible = False
+        'Label3
         '
-        'lblCtrlName
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(10, 50)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(42, 16)
+        Me.Label3.TabIndex = 5
+        Me.Label3.Text = "Höhe:"
         '
-        Me.lblCtrlName.AutoSize = True
-        Me.lblCtrlName.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblCtrlName.Location = New System.Drawing.Point(6, 3)
-        Me.lblCtrlName.Name = "lblCtrlName"
-        Me.lblCtrlName.Size = New System.Drawing.Size(46, 16)
-        Me.lblCtrlName.TabIndex = 0
-        Me.lblCtrlName.Text = "Name:"
+        'Label2
         '
-        'CHOICE_LISTTextBox
+        Me.Label2.AutoSize = True
+        Me.Label2.Location = New System.Drawing.Point(10, 3)
+        Me.Label2.Name = "Label2"
+        Me.Label2.Size = New System.Drawing.Size(46, 16)
+        Me.Label2.TabIndex = 4
+        Me.Label2.Text = "Breite:"
         '
-        Me.CHOICE_LISTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHOICE_LIST", True))
-        Me.CHOICE_LISTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CHOICE_LISTTextBox.Location = New System.Drawing.Point(174, 185)
-        Me.CHOICE_LISTTextBox.Name = "CHOICE_LISTTextBox"
-        Me.CHOICE_LISTTextBox.Size = New System.Drawing.Size(178, 23)
-        Me.CHOICE_LISTTextBox.TabIndex = 13
+        'btnwidth_minus
         '
-        'lblBeschriftung
-        '
-        Me.lblBeschriftung.AutoSize = True
-        Me.lblBeschriftung.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblBeschriftung.Location = New System.Drawing.Point(132, 4)
-        Me.lblBeschriftung.Name = "lblBeschriftung"
-        Me.lblBeschriftung.Size = New System.Drawing.Size(83, 16)
-        Me.lblBeschriftung.TabIndex = 2
-        Me.lblBeschriftung.Text = "Beschriftung:"
-        Me.lblBeschriftung.Visible = False
-        '
-        'VALIDATIONCheckBox
-        '
-        Me.VALIDATIONCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "VALIDATION", True))
-        Me.VALIDATIONCheckBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.VALIDATIONCheckBox.Location = New System.Drawing.Point(6, 143)
-        Me.VALIDATIONCheckBox.Name = "VALIDATIONCheckBox"
-        Me.VALIDATIONCheckBox.Size = New System.Drawing.Size(144, 24)
-        Me.VALIDATIONCheckBox.TabIndex = 12
-        Me.VALIDATIONCheckBox.Text = "Eingabe zwingend"
-        Me.VALIDATIONCheckBox.UseVisualStyleBackColor = True
-        '
-        'lblIndex
-        '
-        Me.lblIndex.AutoSize = True
-        Me.lblIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblIndex.Location = New System.Drawing.Point(3, 84)
-        Me.lblIndex.Name = "lblIndex"
-        Me.lblIndex.Size = New System.Drawing.Size(124, 16)
-        Me.lblIndex.TabIndex = 4
-        Me.lblIndex.Text = "zugeordneter Index:"
-        Me.lblIndex.Visible = False
-        '
-        'CTRL_TEXTTextBox
-        '
-        Me.CTRL_TEXTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CTRL_TEXT", True))
-        Me.CTRL_TEXTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CTRL_TEXTTextBox.Location = New System.Drawing.Point(135, 23)
-        Me.CTRL_TEXTTextBox.Multiline = True
-        Me.CTRL_TEXTTextBox.Name = "CTRL_TEXTTextBox"
-        Me.CTRL_TEXTTextBox.Size = New System.Drawing.Size(298, 23)
-        Me.CTRL_TEXTTextBox.TabIndex = 11
-        '
-        'cmbIndex
-        '
-        Me.cmbIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
-        Me.cmbIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbIndex.FormattingEnabled = True
-        Me.cmbIndex.Location = New System.Drawing.Point(6, 103)
-        Me.cmbIndex.Name = "cmbIndex"
-        Me.cmbIndex.Size = New System.Drawing.Size(178, 24)
-        Me.cmbIndex.TabIndex = 5
-        Me.cmbIndex.Visible = False
-        '
-        'NAMETextBox
-        '
-        Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "NAME", True))
-        Me.NAMETextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.NAMETextBox.Location = New System.Drawing.Point(9, 23)
-        Me.NAMETextBox.Name = "NAMETextBox"
-        Me.NAMETextBox.Size = New System.Drawing.Size(121, 23)
-        Me.NAMETextBox.TabIndex = 10
-        '
-        'CheckBoxAuswahlliste
-        '
-        Me.CheckBoxAuswahlliste.AutoSize = True
-        Me.CheckBoxAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CheckBoxAuswahlliste.Location = New System.Drawing.Point(174, 145)
-        Me.CheckBoxAuswahlliste.Name = "CheckBoxAuswahlliste"
-        Me.CheckBoxAuswahlliste.Size = New System.Drawing.Size(98, 20)
-        Me.CheckBoxAuswahlliste.TabIndex = 6
-        Me.CheckBoxAuswahlliste.Text = "Auswahlliste"
-        Me.CheckBoxAuswahlliste.UseVisualStyleBackColor = True
-        Me.CheckBoxAuswahlliste.Visible = False
-        '
-        'lblAuswahlliste
-        '
-        Me.lblAuswahlliste.AutoSize = True
-        Me.lblAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblAuswahlliste.Location = New System.Drawing.Point(171, 167)
-        Me.lblAuswahlliste.Name = "lblAuswahlliste"
-        Me.lblAuswahlliste.Size = New System.Drawing.Size(186, 16)
-        Me.lblAuswahlliste.TabIndex = 7
-        Me.lblAuswahlliste.Text = "Auswahllistennamen eingeben:"
-        Me.lblAuswahlliste.Visible = False
-        '
-        'INDEX_NAMETextBox
-        '
-        Me.INDEX_NAMETextBox.Location = New System.Drawing.Point(6, 103)
-        Me.INDEX_NAMETextBox.Name = "INDEX_NAMETextBox"
-        Me.INDEX_NAMETextBox.Size = New System.Drawing.Size(319, 23)
-        Me.INDEX_NAMETextBox.TabIndex = 16
-        Me.INDEX_NAMETextBox.Visible = False
-        '
-        'TabPage2
-        '
-        Me.TabPage2.Controls.Add(Me.btnheight_minus)
-        Me.TabPage2.Controls.Add(Me.btnheight_plus)
-        Me.TabPage2.Controls.Add(Me.Label3)
-        Me.TabPage2.Controls.Add(Me.Label2)
-        Me.TabPage2.Controls.Add(Me.btnwidth_minus)
-        Me.TabPage2.Controls.Add(Me.btnwidth_plus)
-        Me.TabPage2.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.TabPage2.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage2.Name = "TabPage2"
-        Me.TabPage2.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage2.Size = New System.Drawing.Size(447, 234)
-        Me.TabPage2.TabIndex = 1
-        Me.TabPage2.Text = "Format"
-        Me.TabPage2.UseVisualStyleBackColor = True
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(10, 50)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(42, 16)
-        Me.Label3.TabIndex = 5
-        Me.Label3.Text = "Höhe:"
+        Me.btnwidth_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnwidth_minus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_out
+        Me.btnwidth_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnwidth_minus.Location = New System.Drawing.Point(94, 22)
+        Me.btnwidth_minus.Name = "btnwidth_minus"
+        Me.btnwidth_minus.Size = New System.Drawing.Size(75, 25)
+        Me.btnwidth_minus.TabIndex = 1
+        Me.btnwidth_minus.Text = "kleiner"
+        Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnwidth_minus.UseVisualStyleBackColor = True
         '
-        'Label2
+        'btnwidth_plus
         '
-        Me.Label2.AutoSize = True
-        Me.Label2.Location = New System.Drawing.Point(10, 3)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(46, 16)
-        Me.Label2.TabIndex = 4
-        Me.Label2.Text = "Breite:"
+        Me.btnwidth_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnwidth_plus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_in
+        Me.btnwidth_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnwidth_plus.Location = New System.Drawing.Point(13, 22)
+        Me.btnwidth_plus.Name = "btnwidth_plus"
+        Me.btnwidth_plus.Size = New System.Drawing.Size(75, 25)
+        Me.btnwidth_plus.TabIndex = 0
+        Me.btnwidth_plus.Text = "größer"
+        Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnwidth_plus.UseVisualStyleBackColor = True
         '
-        'TabPage3
+        'pageSQL
         '
-        Me.TabPage3.Controls.Add(Me.pnlAuswahlliste)
-        Me.TabPage3.Location = New System.Drawing.Point(4, 25)
-        Me.TabPage3.Name = "TabPage3"
-        Me.TabPage3.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage3.Size = New System.Drawing.Size(447, 234)
-        Me.TabPage3.TabIndex = 2
-        Me.TabPage3.Text = "SQL-Liste"
-        Me.TabPage3.UseVisualStyleBackColor = True
+        Me.pageSQL.Controls.Add(Me.pnlAuswahlliste)
+        Me.pageSQL.Location = New System.Drawing.Point(4, 25)
+        Me.pageSQL.Name = "pageSQL"
+        Me.pageSQL.Padding = New System.Windows.Forms.Padding(3)
+        Me.pageSQL.Size = New System.Drawing.Size(447, 234)
+        Me.pageSQL.TabIndex = 2
+        Me.pageSQL.Text = "SQL-Liste"
+        Me.pageSQL.UseVisualStyleBackColor = True
         '
         'pnlAuswahlliste
         '
@@ -500,6 +463,33 @@ Partial Class frmFormDesigner
         Me.pnlAuswahlliste.Size = New System.Drawing.Size(441, 228)
         Me.pnlAuswahlliste.TabIndex = 2
         '
+        'btnEditor
+        '
+        Me.btnEditor.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnEditor.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnEditor.Image = CType(resources.GetObject("btnEditor.Image"), System.Drawing.Image)
+        Me.btnEditor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnEditor.Location = New System.Drawing.Point(6, 197)
+        Me.btnEditor.Name = "btnEditor"
+        Me.btnEditor.Size = New System.Drawing.Size(114, 28)
+        Me.btnEditor.TabIndex = 81
+        Me.btnEditor.Text = "Editor Detail"
+        Me.btnEditor.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnEditor.UseVisualStyleBackColor = True
+        '
+        'btnShowConnections
+        '
+        Me.btnShowConnections.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnShowConnections.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.database_go1
+        Me.btnShowConnections.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnShowConnections.Location = New System.Drawing.Point(271, 30)
+        Me.btnShowConnections.Name = "btnShowConnections"
+        Me.btnShowConnections.Size = New System.Drawing.Size(111, 24)
+        Me.btnShowConnections.TabIndex = 6
+        Me.btnShowConnections.Text = "Connections"
+        Me.btnShowConnections.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnShowConnections.UseVisualStyleBackColor = True
+        '
         'SQL_CommandTextBox
         '
         Me.SQL_CommandTextBox.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -513,6 +503,16 @@ Partial Class frmFormDesigner
         Me.SQL_CommandTextBox.Size = New System.Drawing.Size(433, 115)
         Me.SQL_CommandTextBox.TabIndex = 5
         '
+        '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
+        '
         'Label5
         '
         Me.Label5.AutoSize = True
@@ -546,166 +546,226 @@ Partial Class frmFormDesigner
         Me.cmbConnection.TabIndex = 0
         Me.cmbConnection.ValueMember = "GUID"
         '
-        'TabPage4
+        'TBPM_CONNECTIONBindingSource
         '
-        Me.TabPage4.Controls.Add(Me.pgControls)
-        Me.TabPage4.Location = New System.Drawing.Point(4, 22)
-        Me.TabPage4.Name = "TabPage4"
-        Me.TabPage4.Padding = New System.Windows.Forms.Padding(3)
-        Me.TabPage4.Size = New System.Drawing.Size(447, 237)
-        Me.TabPage4.TabIndex = 3
-        Me.TabPage4.Text = "Eigenschaften"
-        Me.TabPage4.UseVisualStyleBackColor = True
+        Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION"
+        Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet
         '
-        'pgControls
+        'pagePropertiesOld
+        '
+        Me.pagePropertiesOld.AutoScroll = True
+        Me.pagePropertiesOld.BackColor = System.Drawing.Color.White
+        Me.pagePropertiesOld.Controls.Add(Me.LOAD_IDX_VALUECheckBox)
+        Me.pagePropertiesOld.Controls.Add(Me.READ_ONLYCheckBox)
+        Me.pagePropertiesOld.Controls.Add(Me.INDEX_NAME_VALUE)
+        Me.pagePropertiesOld.Controls.Add(Me.rbVektor)
+        Me.pagePropertiesOld.Controls.Add(Me.rbIndex)
+        Me.pagePropertiesOld.Controls.Add(Me.lblCtrlName)
+        Me.pagePropertiesOld.Controls.Add(Me.CHOICE_LISTTextBox)
+        Me.pagePropertiesOld.Controls.Add(Me.lblBeschriftung)
+        Me.pagePropertiesOld.Controls.Add(Me.VALIDATIONCheckBox)
+        Me.pagePropertiesOld.Controls.Add(Me.lblIndex)
+        Me.pagePropertiesOld.Controls.Add(Me.CTRL_TEXTTextBox)
+        Me.pagePropertiesOld.Controls.Add(Me.cmbIndex)
+        Me.pagePropertiesOld.Controls.Add(Me.NAMETextBox)
+        Me.pagePropertiesOld.Controls.Add(Me.CheckBoxAuswahlliste)
+        Me.pagePropertiesOld.Controls.Add(Me.lblAuswahlliste)
+        Me.pagePropertiesOld.Controls.Add(Me.INDEX_NAMETextBox)
+        Me.pagePropertiesOld.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.pagePropertiesOld.Location = New System.Drawing.Point(4, 25)
+        Me.pagePropertiesOld.Name = "pagePropertiesOld"
+        Me.pagePropertiesOld.Padding = New System.Windows.Forms.Padding(3)
+        Me.pagePropertiesOld.Size = New System.Drawing.Size(447, 234)
+        Me.pagePropertiesOld.TabIndex = 0
+        Me.pagePropertiesOld.Text = "Allgemein (Alt)"
         '
-        Me.pgControls.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pgControls.HelpVisible = False
-        Me.pgControls.Location = New System.Drawing.Point(3, 3)
-        Me.pgControls.Name = "pgControls"
-        Me.pgControls.Size = New System.Drawing.Size(441, 228)
-        Me.pgControls.TabIndex = 0
+        'LOAD_IDX_VALUECheckBox
         '
-        'CHANGED_WHOTextBox
+        Me.LOAD_IDX_VALUECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "LOAD_IDX_VALUE", True))
+        Me.LOAD_IDX_VALUECheckBox.Enabled = False
+        Me.LOAD_IDX_VALUECheckBox.Location = New System.Drawing.Point(6, 185)
+        Me.LOAD_IDX_VALUECheckBox.Name = "LOAD_IDX_VALUECheckBox"
+        Me.LOAD_IDX_VALUECheckBox.Size = New System.Drawing.Size(121, 24)
+        Me.LOAD_IDX_VALUECheckBox.TabIndex = 19
+        Me.LOAD_IDX_VALUECheckBox.Text = "Lade Indexdaten"
+        Me.ToolTip1.SetToolTip(Me.LOAD_IDX_VALUECheckBox, "Die im zugrundeliegenden Index gepeicherten" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Daten werden nicht angezeigt")
+        Me.LOAD_IDX_VALUECheckBox.UseVisualStyleBackColor = True
         '
-        Me.CHANGED_WHOTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHO", True))
-        Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(15, 518)
-        Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
-        Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(222, 23)
-        Me.CHANGED_WHOTextBox.TabIndex = 19
+        'READ_ONLYCheckBox
         '
-        'StatusStrip1
+        Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "READ_ONLY", True))
+        Me.READ_ONLYCheckBox.Enabled = False
+        Me.READ_ONLYCheckBox.Location = New System.Drawing.Point(6, 164)
+        Me.READ_ONLYCheckBox.Name = "READ_ONLYCheckBox"
+        Me.READ_ONLYCheckBox.Size = New System.Drawing.Size(86, 24)
+        Me.READ_ONLYCheckBox.TabIndex = 18
+        Me.READ_ONLYCheckBox.Text = "Read Only"
+        Me.ToolTip1.SetToolTip(Me.READ_ONLYCheckBox, "lässt keine Änderungen am Index zu")
+        Me.READ_ONLYCheckBox.UseVisualStyleBackColor = True
         '
-        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen})
-        Me.StatusStrip1.Location = New System.Drawing.Point(0, 556)
-        Me.StatusStrip1.Name = "StatusStrip1"
-        Me.StatusStrip1.Size = New System.Drawing.Size(995, 22)
-        Me.StatusStrip1.TabIndex = 20
-        Me.StatusStrip1.Text = "StatusStrip1"
+        'INDEX_NAME_VALUE
         '
-        'CHANGED_WHENTextBox
+        Me.INDEX_NAME_VALUE.BackColor = System.Drawing.Color.White
+        Me.INDEX_NAME_VALUE.BorderStyle = System.Windows.Forms.BorderStyle.None
+        Me.INDEX_NAME_VALUE.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
+        Me.INDEX_NAME_VALUE.Enabled = False
+        Me.INDEX_NAME_VALUE.ForeColor = System.Drawing.Color.White
+        Me.INDEX_NAME_VALUE.Location = New System.Drawing.Point(334, 142)
+        Me.INDEX_NAME_VALUE.Name = "INDEX_NAME_VALUE"
+        Me.INDEX_NAME_VALUE.ReadOnly = True
+        Me.INDEX_NAME_VALUE.Size = New System.Drawing.Size(51, 16)
+        Me.INDEX_NAME_VALUE.TabIndex = 17
+        Me.INDEX_NAME_VALUE.TabStop = False
         '
-        Me.CHANGED_WHENTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHEN", True))
-        Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(253, 518)
-        Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
-        Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(159, 23)
-        Me.CHANGED_WHENTextBox.TabIndex = 21
+        'rbVektor
         '
-        'TBPM_PROFILE_CONTROLSBindingSource
+        Me.rbVektor.AutoSize = True
+        Me.rbVektor.Enabled = False
+        Me.rbVektor.Location = New System.Drawing.Point(174, 52)
+        Me.rbVektor.Name = "rbVektor"
+        Me.rbVektor.Size = New System.Drawing.Size(225, 20)
+        Me.rbVektor.TabIndex = 15
+        Me.rbVektor.TabStop = True
+        Me.rbVektor.Text = "Benutze Vektor-Feld für Metadaten"
+        Me.rbVektor.UseVisualStyleBackColor = True
+        Me.rbVektor.Visible = False
         '
-        Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS"
-        Me.TBPM_PROFILE_CONTROLSBindingSource.DataSource = Me.DD_DMSLiteDataSet
+        'rbIndex
         '
-        'DD_DMSLiteDataSet
+        Me.rbIndex.AutoSize = True
+        Me.rbIndex.Enabled = False
+        Me.rbIndex.Location = New System.Drawing.Point(9, 52)
+        Me.rbIndex.Name = "rbIndex"
+        Me.rbIndex.Size = New System.Drawing.Size(159, 20)
+        Me.rbIndex.TabIndex = 14
+        Me.rbIndex.TabStop = True
+        Me.rbIndex.Text = "Beschreibe Index direkt"
+        Me.rbIndex.UseVisualStyleBackColor = True
+        Me.rbIndex.Visible = False
         '
-        Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet"
-        Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
+        'lblCtrlName
         '
-        'btnrefresh
+        Me.lblCtrlName.AutoSize = True
+        Me.lblCtrlName.Enabled = False
+        Me.lblCtrlName.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblCtrlName.Location = New System.Drawing.Point(6, 3)
+        Me.lblCtrlName.Name = "lblCtrlName"
+        Me.lblCtrlName.Size = New System.Drawing.Size(46, 16)
+        Me.lblCtrlName.TabIndex = 0
+        Me.lblCtrlName.Text = "Name:"
         '
-        Me.btnrefresh.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.arrow_refresh
-        Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnrefresh.Location = New System.Drawing.Point(415, 41)
-        Me.btnrefresh.Name = "btnrefresh"
-        Me.btnrefresh.Size = New System.Drawing.Size(81, 23)
-        Me.btnrefresh.TabIndex = 24
-        Me.btnrefresh.Text = "Refresh"
-        Me.btnrefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnrefresh.UseVisualStyleBackColor = True
+        'CHOICE_LISTTextBox
         '
-        'tslblAenderungen
+        Me.CHOICE_LISTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHOICE_LIST", True))
+        Me.CHOICE_LISTTextBox.Enabled = False
+        Me.CHOICE_LISTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.CHOICE_LISTTextBox.Location = New System.Drawing.Point(174, 185)
+        Me.CHOICE_LISTTextBox.Name = "CHOICE_LISTTextBox"
+        Me.CHOICE_LISTTextBox.Size = New System.Drawing.Size(178, 23)
+        Me.CHOICE_LISTTextBox.TabIndex = 13
         '
-        Me.tslblAenderungen.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.flag_red
-        Me.tslblAenderungen.Name = "tslblAenderungen"
-        Me.tslblAenderungen.Size = New System.Drawing.Size(153, 17)
-        Me.tslblAenderungen.Text = "Änderungen gespeichert"
-        Me.tslblAenderungen.Visible = False
+        'lblBeschriftung
+        '
+        Me.lblBeschriftung.AutoSize = True
+        Me.lblBeschriftung.Enabled = False
+        Me.lblBeschriftung.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblBeschriftung.Location = New System.Drawing.Point(132, 4)
+        Me.lblBeschriftung.Name = "lblBeschriftung"
+        Me.lblBeschriftung.Size = New System.Drawing.Size(83, 16)
+        Me.lblBeschriftung.TabIndex = 2
+        Me.lblBeschriftung.Text = "Beschriftung:"
+        Me.lblBeschriftung.Visible = False
+        '
+        'VALIDATIONCheckBox
+        '
+        Me.VALIDATIONCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "VALIDATION", True))
+        Me.VALIDATIONCheckBox.Enabled = False
+        Me.VALIDATIONCheckBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.VALIDATIONCheckBox.Location = New System.Drawing.Point(6, 143)
+        Me.VALIDATIONCheckBox.Name = "VALIDATIONCheckBox"
+        Me.VALIDATIONCheckBox.Size = New System.Drawing.Size(144, 24)
+        Me.VALIDATIONCheckBox.TabIndex = 12
+        Me.VALIDATIONCheckBox.Text = "Eingabe zwingend"
+        Me.VALIDATIONCheckBox.UseVisualStyleBackColor = True
         '
-        'btnheight_minus
+        'lblIndex
         '
-        Me.btnheight_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnheight_minus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_out
-        Me.btnheight_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnheight_minus.Location = New System.Drawing.Point(94, 69)
-        Me.btnheight_minus.Name = "btnheight_minus"
-        Me.btnheight_minus.Size = New System.Drawing.Size(75, 25)
-        Me.btnheight_minus.TabIndex = 1
-        Me.btnheight_minus.Text = "kleiner"
-        Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnheight_minus.UseVisualStyleBackColor = True
+        Me.lblIndex.AutoSize = True
+        Me.lblIndex.Enabled = False
+        Me.lblIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblIndex.Location = New System.Drawing.Point(3, 84)
+        Me.lblIndex.Name = "lblIndex"
+        Me.lblIndex.Size = New System.Drawing.Size(124, 16)
+        Me.lblIndex.TabIndex = 4
+        Me.lblIndex.Text = "zugeordneter Index:"
+        Me.lblIndex.Visible = False
         '
-        'btnheight_plus
+        'CTRL_TEXTTextBox
         '
-        Me.btnheight_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnheight_plus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_in
-        Me.btnheight_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnheight_plus.Location = New System.Drawing.Point(13, 69)
-        Me.btnheight_plus.Name = "btnheight_plus"
-        Me.btnheight_plus.Size = New System.Drawing.Size(75, 25)
-        Me.btnheight_plus.TabIndex = 0
-        Me.btnheight_plus.Text = "größer"
-        Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnheight_plus.UseVisualStyleBackColor = True
+        Me.CTRL_TEXTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CTRL_TEXT", True))
+        Me.CTRL_TEXTTextBox.Enabled = False
+        Me.CTRL_TEXTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.CTRL_TEXTTextBox.Location = New System.Drawing.Point(135, 23)
+        Me.CTRL_TEXTTextBox.Multiline = True
+        Me.CTRL_TEXTTextBox.Name = "CTRL_TEXTTextBox"
+        Me.CTRL_TEXTTextBox.Size = New System.Drawing.Size(298, 23)
+        Me.CTRL_TEXTTextBox.TabIndex = 11
         '
-        'btnwidth_minus
+        'cmbIndex
         '
-        Me.btnwidth_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnwidth_minus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_out
-        Me.btnwidth_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnwidth_minus.Location = New System.Drawing.Point(94, 22)
-        Me.btnwidth_minus.Name = "btnwidth_minus"
-        Me.btnwidth_minus.Size = New System.Drawing.Size(75, 25)
-        Me.btnwidth_minus.TabIndex = 1
-        Me.btnwidth_minus.Text = "kleiner"
-        Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnwidth_minus.UseVisualStyleBackColor = True
+        Me.cmbIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
+        Me.cmbIndex.Enabled = False
+        Me.cmbIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cmbIndex.FormattingEnabled = True
+        Me.cmbIndex.Location = New System.Drawing.Point(6, 103)
+        Me.cmbIndex.Name = "cmbIndex"
+        Me.cmbIndex.Size = New System.Drawing.Size(178, 24)
+        Me.cmbIndex.TabIndex = 5
+        Me.cmbIndex.Visible = False
         '
-        'btnwidth_plus
+        'NAMETextBox
         '
-        Me.btnwidth_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnwidth_plus.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.zoom_in
-        Me.btnwidth_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnwidth_plus.Location = New System.Drawing.Point(13, 22)
-        Me.btnwidth_plus.Name = "btnwidth_plus"
-        Me.btnwidth_plus.Size = New System.Drawing.Size(75, 25)
-        Me.btnwidth_plus.TabIndex = 0
-        Me.btnwidth_plus.Text = "größer"
-        Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnwidth_plus.UseVisualStyleBackColor = True
+        Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "NAME", True))
+        Me.NAMETextBox.Enabled = False
+        Me.NAMETextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.NAMETextBox.Location = New System.Drawing.Point(9, 23)
+        Me.NAMETextBox.Name = "NAMETextBox"
+        Me.NAMETextBox.Size = New System.Drawing.Size(121, 23)
+        Me.NAMETextBox.TabIndex = 10
         '
-        'btnEditor
+        'CheckBoxAuswahlliste
         '
-        Me.btnEditor.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.btnEditor.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnEditor.Image = CType(resources.GetObject("btnEditor.Image"), System.Drawing.Image)
-        Me.btnEditor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnEditor.Location = New System.Drawing.Point(6, 197)
-        Me.btnEditor.Name = "btnEditor"
-        Me.btnEditor.Size = New System.Drawing.Size(114, 28)
-        Me.btnEditor.TabIndex = 81
-        Me.btnEditor.Text = "Editor Detail"
-        Me.btnEditor.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnEditor.UseVisualStyleBackColor = True
+        Me.CheckBoxAuswahlliste.AutoSize = True
+        Me.CheckBoxAuswahlliste.Enabled = False
+        Me.CheckBoxAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.CheckBoxAuswahlliste.Location = New System.Drawing.Point(174, 145)
+        Me.CheckBoxAuswahlliste.Name = "CheckBoxAuswahlliste"
+        Me.CheckBoxAuswahlliste.Size = New System.Drawing.Size(98, 20)
+        Me.CheckBoxAuswahlliste.TabIndex = 6
+        Me.CheckBoxAuswahlliste.Text = "Auswahlliste"
+        Me.CheckBoxAuswahlliste.UseVisualStyleBackColor = True
+        Me.CheckBoxAuswahlliste.Visible = False
         '
-        'btnShowConnections
+        'lblAuswahlliste
         '
-        Me.btnShowConnections.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnShowConnections.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.database_go1
-        Me.btnShowConnections.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnShowConnections.Location = New System.Drawing.Point(271, 30)
-        Me.btnShowConnections.Name = "btnShowConnections"
-        Me.btnShowConnections.Size = New System.Drawing.Size(111, 24)
-        Me.btnShowConnections.TabIndex = 6
-        Me.btnShowConnections.Text = "Connections"
-        Me.btnShowConnections.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnShowConnections.UseVisualStyleBackColor = True
+        Me.lblAuswahlliste.AutoSize = True
+        Me.lblAuswahlliste.Enabled = False
+        Me.lblAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lblAuswahlliste.Location = New System.Drawing.Point(171, 167)
+        Me.lblAuswahlliste.Name = "lblAuswahlliste"
+        Me.lblAuswahlliste.Size = New System.Drawing.Size(186, 16)
+        Me.lblAuswahlliste.TabIndex = 7
+        Me.lblAuswahlliste.Text = "Auswahllistennamen eingeben:"
+        Me.lblAuswahlliste.Visible = False
         '
-        'TBPM_CONNECTIONBindingSource
+        'INDEX_NAMETextBox
         '
-        Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION"
-        Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet
+        Me.INDEX_NAMETextBox.Enabled = False
+        Me.INDEX_NAMETextBox.Location = New System.Drawing.Point(6, 103)
+        Me.INDEX_NAMETextBox.Name = "INDEX_NAMETextBox"
+        Me.INDEX_NAMETextBox.Size = New System.Drawing.Size(319, 23)
+        Me.INDEX_NAMETextBox.TabIndex = 16
+        Me.INDEX_NAMETextBox.Visible = False
         '
         'btndelete
         '
@@ -734,96 +794,52 @@ Partial Class frmFormDesigner
         Me.btnsave.UseVisualStyleBackColor = True
         Me.btnsave.Visible = False
         '
-        'btnTabelle
-        '
-        Me.btnTabelle.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnTabelle.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.table_add
-        Me.btnTabelle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnTabelle.Location = New System.Drawing.Point(290, 55)
-        Me.btnTabelle.Name = "btnTabelle"
-        Me.btnTabelle.Size = New System.Drawing.Size(103, 29)
-        Me.btnTabelle.TabIndex = 6
-        Me.btnTabelle.Text = "Tabelle"
-        Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnTabelle.UseVisualStyleBackColor = True
-        '
-        'btnCheckbox
-        '
-        Me.btnCheckbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnCheckbox.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.checkbox_16xLG
-        Me.btnCheckbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnCheckbox.Location = New System.Drawing.Point(151, 90)
-        Me.btnCheckbox.Name = "btnCheckbox"
-        Me.btnCheckbox.Size = New System.Drawing.Size(133, 31)
-        Me.btnCheckbox.TabIndex = 5
-        Me.btnCheckbox.Text = "Checkbox"
-        Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnCheckbox.UseVisualStyleBackColor = True
-        '
-        'btnVektor
+        'CHANGED_WHOTextBox
         '
-        Me.btnVektor.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnVektor.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.table_add
-        Me.btnVektor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnVektor.Location = New System.Drawing.Point(151, 55)
-        Me.btnVektor.Name = "btnVektor"
-        Me.btnVektor.Size = New System.Drawing.Size(133, 29)
-        Me.btnVektor.TabIndex = 4
-        Me.btnVektor.Text = "Mehrfach-/Vektorfeld"
-        Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnVektor.UseVisualStyleBackColor = True
+        Me.CHANGED_WHOTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHO", True))
+        Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(15, 518)
+        Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
+        Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(222, 23)
+        Me.CHANGED_WHOTextBox.TabIndex = 19
         '
-        'btndtp
+        'StatusStrip1
         '
-        Me.btndtp.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btndtp.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.DateOrTimePicker_675
-        Me.btndtp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btndtp.Location = New System.Drawing.Point(151, 22)
-        Me.btndtp.Name = "btndtp"
-        Me.btndtp.Size = New System.Drawing.Size(133, 27)
-        Me.btndtp.TabIndex = 3
-        Me.btndtp.Text = "DatePicker"
-        Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btndtp.UseVisualStyleBackColor = True
+        Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen})
+        Me.StatusStrip1.Location = New System.Drawing.Point(0, 556)
+        Me.StatusStrip1.Name = "StatusStrip1"
+        Me.StatusStrip1.Size = New System.Drawing.Size(995, 22)
+        Me.StatusStrip1.TabIndex = 20
+        Me.StatusStrip1.Text = "StatusStrip1"
         '
-        'btncmb
+        'tslblAenderungen
         '
-        Me.btncmb.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btncmb.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.ComboBox_16xLG
-        Me.btncmb.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btncmb.Location = New System.Drawing.Point(12, 90)
-        Me.btncmb.Name = "btncmb"
-        Me.btncmb.Size = New System.Drawing.Size(133, 31)
-        Me.btncmb.TabIndex = 2
-        Me.btncmb.Text = "Combobox"
-        Me.btncmb.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btncmb.UseVisualStyleBackColor = True
+        Me.tslblAenderungen.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.flag_red
+        Me.tslblAenderungen.Name = "tslblAenderungen"
+        Me.tslblAenderungen.Size = New System.Drawing.Size(153, 17)
+        Me.tslblAenderungen.Text = "Änderungen gespeichert"
+        Me.tslblAenderungen.Visible = False
         '
-        'btntextbox
+        'CHANGED_WHENTextBox
         '
-        Me.btntextbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btntextbox.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.TextBox_708
-        Me.btntextbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btntextbox.Location = New System.Drawing.Point(13, 55)
-        Me.btntextbox.Name = "btntextbox"
-        Me.btntextbox.Size = New System.Drawing.Size(133, 29)
-        Me.btntextbox.TabIndex = 1
-        Me.btntextbox.Text = "Textbox"
-        Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btntextbox.UseVisualStyleBackColor = True
+        Me.CHANGED_WHENTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHEN", True))
+        Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(253, 518)
+        Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
+        Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(159, 23)
+        Me.CHANGED_WHENTextBox.TabIndex = 21
         '
-        'btnlabel
+        'btnrefresh
         '
-        Me.btnlabel.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnlabel.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Label_684
-        Me.btnlabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnlabel.Location = New System.Drawing.Point(12, 22)
-        Me.btnlabel.Name = "btnlabel"
-        Me.btnlabel.Size = New System.Drawing.Size(133, 27)
-        Me.btnlabel.TabIndex = 0
-        Me.btnlabel.Text = "Label"
-        Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnlabel.UseVisualStyleBackColor = True
+        Me.btnrefresh.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.arrow_refresh
+        Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnrefresh.Location = New System.Drawing.Point(415, 41)
+        Me.btnrefresh.Name = "btnrefresh"
+        Me.btnrefresh.Size = New System.Drawing.Size(81, 23)
+        Me.btnrefresh.TabIndex = 24
+        Me.btnrefresh.Text = "Refresh"
+        Me.btnrefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnrefresh.UseVisualStyleBackColor = True
         '
         'TBPM_PROFILE_CONTROLSTableAdapter
         '
@@ -832,6 +848,7 @@ Partial Class frmFormDesigner
         'TableAdapterManager
         '
         Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_CONNECTIONTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Nothing
         Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing
@@ -842,7 +859,6 @@ Partial Class frmFormDesigner
         Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_PROFILETableAdapter = Nothing
         Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
         'TBPM_CONNECTIONTableAdapter
@@ -896,19 +912,19 @@ Partial Class frmFormDesigner
         Me.pnldesigner.PerformLayout()
         Me.gbxControl.ResumeLayout(False)
         Me.TabControlEigenschaften.ResumeLayout(False)
-        Me.TabPage1.ResumeLayout(False)
-        Me.TabPage1.PerformLayout()
-        Me.TabPage2.ResumeLayout(False)
-        Me.TabPage2.PerformLayout()
-        Me.TabPage3.ResumeLayout(False)
+        Me.pageProperties.ResumeLayout(False)
+        Me.pageFormat.ResumeLayout(False)
+        Me.pageFormat.PerformLayout()
+        Me.pageSQL.ResumeLayout(False)
         Me.pnlAuswahlliste.ResumeLayout(False)
         Me.pnlAuswahlliste.PerformLayout()
-        Me.TabPage4.ResumeLayout(False)
-        Me.StatusStrip1.ResumeLayout(False)
-        Me.StatusStrip1.PerformLayout()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.pagePropertiesOld.ResumeLayout(False)
+        Me.pagePropertiesOld.PerformLayout()
+        Me.StatusStrip1.ResumeLayout(False)
+        Me.StatusStrip1.PerformLayout()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
@@ -947,8 +963,8 @@ Partial Class frmFormDesigner
     Friend WithEvents tslblAenderungen As System.Windows.Forms.ToolStripStatusLabel
     Friend WithEvents CHANGED_WHENTextBox As System.Windows.Forms.TextBox
     Friend WithEvents TabControlEigenschaften As System.Windows.Forms.TabControl
-    Friend WithEvents TabPage1 As System.Windows.Forms.TabPage
-    Friend WithEvents TabPage2 As System.Windows.Forms.TabPage
+    Friend WithEvents pagePropertiesOld As System.Windows.Forms.TabPage
+    Friend WithEvents pageFormat As System.Windows.Forms.TabPage
     Friend WithEvents btnwidth_minus As System.Windows.Forms.Button
     Friend WithEvents btnwidth_plus As System.Windows.Forms.Button
     Friend WithEvents btnheight_minus As System.Windows.Forms.Button
@@ -956,7 +972,7 @@ Partial Class frmFormDesigner
     Friend WithEvents Label3 As System.Windows.Forms.Label
     Friend WithEvents Label2 As System.Windows.Forms.Label
     Friend WithEvents btnVektor As System.Windows.Forms.Button
-    Friend WithEvents TabPage3 As System.Windows.Forms.TabPage
+    Friend WithEvents pageSQL As System.Windows.Forms.TabPage
     Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter
     Friend WithEvents pnlAuswahlliste As System.Windows.Forms.Panel
@@ -980,6 +996,6 @@ Partial Class frmFormDesigner
     Friend WithEvents btnrefresh As System.Windows.Forms.Button
     Friend WithEvents btnShowConnections As System.Windows.Forms.Button
     Friend WithEvents btnEditor As Button
-    Friend WithEvents TabPage4 As TabPage
+    Friend WithEvents pageProperties As TabPage
     Friend WithEvents pgControls As PropertyGrid
 End Class
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx
index 85dcde1..832da02 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.resx
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx
@@ -123,15 +123,6 @@
   <metadata name="CHANGED_WHENLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
-  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>179, 17</value>
-  </metadata>
-  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>898, 56</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="btnEditor.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -143,9 +134,18 @@
         QAAAAABJRU5ErkJggg==
 </value>
   </data>
+  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>179, 17</value>
+  </metadata>
+  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="TBPM_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1021, 17</value>
   </metadata>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>898, 56</value>
+  </metadata>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>904, 17</value>
   </metadata>
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index 0aa3bc9..326ae81 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -1,5 +1,6 @@
-Public Class frmFormDesigner
-    Public _windreamPM As ClassPMWindream
+Imports DD_LIB_Standards
+
+Public Class frmFormDesigner
     Private COLUMN_GUID
     Private MouseIsDown As Boolean = False
     Private idxlbl As Integer = 0
@@ -53,11 +54,8 @@
             pnldesigner.Controls.Clear()
             CURRENT_CONTROL = Nothing
             Try
-                DD_LIB_Standards.clsWindream.Create_Session()
-                ' Windream instanziieren
-                _windreamPM = New ClassPMWindream()
-                'Windream initialisieren (Connection, Session, ... aufbauen)
-                _windreamPM.Init()
+                ' Windream initialisieren
+                clsWindream.Create_Session()
             Catch ex As Exception
                 MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
             End Try
@@ -79,7 +77,7 @@
     End Sub
     Sub Load_indexe()
         cmbIndex.Items.Clear()
-        Dim indexe = _windreamPM.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
+        Dim indexe = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
         If indexe IsNot Nothing Then
             cmbIndex.Items.Add("")
             For Each index As String In indexe
@@ -92,15 +90,14 @@
     Sub Load_Indexe_Vektor()
         Try
             Me.cmbIndex.Items.Clear()
-            Dim indexe = _windreamPM.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
+
+            Dim indexe = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
             If indexe IsNot Nothing Then
                 Me.cmbIndex.Items.Add("")
                 For Each index As String In indexe
                     Dim _vektorString As Boolean = False
-                    'If index.StartsWith("Vektor") Or index.StartsWith("vkt") Then
-                    '    MsgBox(_windreamPM.GetTypeOfIndex(index).ToString)
-                    'End If
-                    Select Case _windreamPM.GetTypeOfIndex(index)
+
+                    Select Case clsWD_GET.GetTypeOfIndexAsIntByName(index)
                         Case 4107 'Vektor Zahl
                             _vektorString = True
                         Case 4097
@@ -122,8 +119,8 @@
         _loading = True
         Try
             TabControlEigenschaften.SelectedIndex = 0
-            Me.cmbIndex.Visible = False
-            Me.INDEX_NAMETextBox.Visible = False
+            cmbIndex.Visible = False
+            INDEX_NAMETextBox.Visible = False
             If ID = 0 Then
                 If IsNothing(CURRENT_CONTROL.Tag) Then
                     Dim ID_CTRL = GetControlGUID(CURRENT_CONTROL.Name)
@@ -185,19 +182,13 @@
         _loading = False
     End Sub
 
-    Function CreateBaseControl(ctrl As Control, guid As Integer, name As String, x As Integer, y As Integer, font As Font, color As Color)
-        ctrl.Tag = guid
-        ctrl.Name = name
-        ctrl.Location = New Point(x, y)
-        ctrl.Font = font
-        ctrl.ForeColor = color
 
-        Return ctrl
-    End Function
 
     Sub Controls_laden()
         Try
             TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_ProfilGUID)
+            TBPM_CONTROL_TABLETableAdapter.FillAll(DD_DMSLiteDataSet.TBPM_CONTROL_TABLE)
+
             ' löscht alle Controls
             pnldesigner.Controls.Clear()
 
@@ -218,26 +209,55 @@
                 ' Jetzt die Control spezifischen Eigenschaften zuweisen
                 Select Case row.Item("CTRL_TYPE")
                     Case "TXT"
-                        Dim ctrl = CreateBaseControl(New TextBox, guid, name, x, y, font, color)
-                        AddExistingTextbox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim txt = ClassControlCreator.CreateExistingTextbox(row, True)
+                        pnldesigner.Controls.Add(txt)
+                        SetMovementHandlers(txt)
+
+                        'Dim ctrl = CreateBaseControl(New TextBox, guid, name, x, y, font, color)
+                        'AddExistingTextbox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "LBL"
-                        Dim ctrl = CreateBaseControl(New Label, guid, name, x, y, font, color)
-                        AddExistingLabel(ctrl, row.Item("CTRL_TEXT"))
+                        Dim lbl = ClassControlCreator.CreateExistingLabel(row, True)
+                        pnldesigner.Controls.Add(lbl)
+                        SetMovementHandlers(lbl)
+
+                        'Dim ctrl = CreateBaseControl(New Label, guid, name, x, y, font, color)
+                        'AddExistingLabel(ctrl, row.Item("CTRL_TEXT"))
                     Case "CMB"
-                        Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
-                        AddExistingCombobox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim cmb = ClassControlCreator.CreateExistingCombobox(row, True)
+                        pnldesigner.Controls.Add(cmb)
+                        SetMovementHandlers(cmb)
+
+                        'Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
+                        'AddExistingCombobox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "DTP"
-                        Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
-                        AddExistingDatetimepicker(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
-                    Case "DGV"
-                        Dim ctrl = CreateBaseControl(New DataGridView, guid, name, x, y, font, color)
-                        AddExistingDatagridview(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim dtp = ClassControlCreator.CreateExistingDatepicker(row, True)
+                        pnldesigner.Controls.Add(dtp)
+                        SetMovementHandlers(dtp)
+
+                        'Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
+                        'AddExistingDatetimepicker(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "CHK"
-                        Dim ctrl = CreateBaseControl(New CheckBox, guid, name, x, y, font, color)
-                        AddExistingCheckbox(ctrl, row.Item("CTRL_TEXT"), row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim chk = ClassControlCreator.CreateExisingCheckbox(row, True)
+                        pnldesigner.Controls.Add(chk)
+                        SetMovementHandlers(chk)
+
+                        'Dim ctrl = CreateBaseControl(New CheckBox, guid, name, x, y, font, color)
+                        'AddExistingCheckbox(ctrl, row.Item("CTRL_TEXT"), row.Item("WIDTH"), row.Item("HEIGHT"))
+                    Case "DGV"
+                        Dim dgv = ClassControlCreator.CreateExistingDataGridView(row, True)
+                        pnldesigner.Controls.Add(dgv)
+                        SetMovementHandlers(dgv)
+
+                        'Dim ctrl = CreateBaseControl(New DataGridView, guid, name, x, y, font, color)
+                        'AddExistingDatagridview(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "TABLE"
-                        Dim ctrl = CreateBaseControl(New DataGridView, guid, name, x, y, font, color)
-                        AddExistingTable(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
+                        Dim columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow) = (From r As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In DD_DMSLiteDataSet.TBPM_CONTROL_TABLE
+                                                                                           Where r.CONTROL_ID = guid
+                                                                                           Select r).ToList()
+                        Dim table = ClassControlCreator.CreateExistingTable(row, columns, True)
+
+                        pnldesigner.Controls.Add(table)
+                        SetMovementHandlers(table)
                 End Select
             Next
         Catch ex As Exception
@@ -245,7 +265,7 @@
         End Try
 
     End Sub
-    Private Sub DragDropButtons_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown,
+    Private Sub DragDropButtons_MouseDown(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown,
             btnTabelle.MouseDown, btnCheckbox.MouseDown
         MouseIsDown = True
         CURRENT_CONTROL = Nothing
@@ -254,11 +274,35 @@
         Catch ex As Exception
 
         End Try
-
     End Sub
 
+    Private Sub DragDropButtons_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove, btntextbox.MouseMove, btncmb.MouseMove, btndtp.MouseMove, btnVektor.MouseMove, btnTabelle.MouseMove, btnCheckbox.MouseMove
+        If MouseIsDown Then
+            Dim btn As Button = sender
+            Dim dragDropData As String
+
+            Select Case btn.Name
+                Case "btnlabel"
+                    dragDropData = "lbl"
+                Case "btntextbox"
+                    dragDropData = "txt"
+                Case "btncmb"
+                    dragDropData = "cmb"
+                Case "btndtp"
+                    dragDropData = "dtp"
+                Case "btnVektor"
+                    dragDropData = "dgv"
+                Case "btnTabelle"
+                    dragDropData = "tb"
+                Case "btnCheckbox"
+                    dragDropData = "chk"
+            End Select
+
+            btn.DoDragDrop(dragDropData, DragDropEffects.Copy)
+        End If
+    End Sub
 
-    Private Sub btnlabel_MouseMove(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles btnlabel.MouseMove
+    Private Sub btnlabel_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove
         If MouseIsDown Then
             ' Initiate dragging. 
             btnlabel.DoDragDrop("lbl", DragDropEffects.Copy)
@@ -266,7 +310,7 @@
         MouseIsDown = False
     End Sub
 
-    Private Sub btntextbox_MouseMove(sender As Object, e As System.Windows.Forms.MouseEventArgs) Handles btntextbox.MouseMove
+    Private Sub btntextbox_MouseMove(sender As Object, e As MouseEventArgs) Handles btntextbox.MouseMove
         If MouseIsDown Then
             ' Initiate dragging. 
             btntextbox.DoDragDrop("txt", DragDropEffects.Copy)
@@ -283,21 +327,21 @@
                 AddNewLabel("lbl" & random.ToString)
             Case "txt"
                 'idxtxt += 1
-                add_newtextbox("txt" & random)
+                AddNewTextbox("txt" & random)
             Case "cmb"
                 'idxcmb += 1
-                add_newCombobox("cmb" & random)
+                AddNewCombobox("cmb" & random)
             Case "dtp"
                 'idxdtp += 1
-                add_newDTP("dtp" & random)
+                AddNewDatetimepicker("dtp" & random)
             Case "dgv"
                 'idxdgv += 1
-                add_newDGV("dgv" & random)
+                AddNewDGV("dgv" & random)
             Case "chk"
                 ' idxchk += 1
-                add_newCheckbox("chk" & random)
+                AddNewCheckbox("chk" & random)
             Case "tb"
-                add_newTABLE("tb" & random)
+                AddNewTable("tb" & random)
         End Select
     End Sub
 
@@ -326,17 +370,11 @@
             lbl.Name = lblname
             lbl.Text = "Bez. definieren"
             lbl.AutoSize = True
-            'lbl.Size = New Size(CInt(lbl.Text.Length * 10), 16)
-            'lbl.Size = New Size(300, 27)
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
             lbl.Location = New Point(clientPosition)
             pnldesigner.Controls.Add(lbl)
             CURRENT_CONTROL = lbl
 
-            'AddHandler lbl.Click, AddressOf OnlblClick
-            'AddHandler lbl.MouseDown, AddressOf MovableLabel_MouseDown
-            'AddHandler lbl.MouseUp, AddressOf MovableCtrl_MouseUp
-            'AddHandler lbl.MouseMove, AddressOf Control_MouseMove 'MovableLabel_MouseMove
             SetMovementHandlers(lbl)
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, lbl.Name, "LBL", lblname, lbl.Location.X, lbl.Location.Y, Environment.UserName, 16, 200)
@@ -359,14 +397,14 @@
         Dim sql = String.Format("SELECT MAX(GUID) FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0}", CURRENT_ProfilGUID)
         Return ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
     End Function
-    Function add_newtextbox(txtname As String)
+    Function AddNewTextbox(txtname As String)
         Try
             Dim txt As New TextBox
             txt.Name = txtname
             txt.Size = New Size(200, 27)
             txt.Cursor = Cursors.Hand
             txt.ReadOnly = True
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
             txt.Location = New Point(clientPosition)
             txt.BackColor = Color.White
             pnldesigner.Controls.Add(txt)
@@ -376,8 +414,7 @@
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, txt.Name, "TXT", txtname, txt.Location.X, txt.Location.Y, Environment.UserName, 27, 200)
             CURRENT_CONTROL.Tag = GetLastID()
-            'GetControlGUID(txt.Name)
-            'Load_Control()
+
             btnsave.Visible = True
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen TextBox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -400,7 +437,7 @@
 
         btnsave.Visible = True
     End Function
-    Function add_newCheckbox(chkname As String)
+    Function AddNewCheckbox(chkname As String)
         Try
 
             Dim chk As New CheckBox
@@ -409,7 +446,7 @@
             chk.AutoSize = True
             chk.Text = "Beschriftung def."
             chk.Cursor = Cursors.Hand
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
             chk.Location = New Point(clientPosition)
             pnldesigner.Controls.Add(chk)
             CURRENT_CONTROL = chk
@@ -418,7 +455,7 @@
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, chk.Name, "CHK", chkname, chk.Location.X, chk.Location.Y, Environment.UserName, 27, 200)
             CURRENT_CONTROL.Tag = GetLastID()
-            Load_Control()
+            'Load_Control()
             btnsave.Visible = True
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen Checkbox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -434,13 +471,13 @@
 
         btnsave.Visible = True
     End Function
-    Function add_newCombobox(cmbname As String)
+    Function AddNewCombobox(cmbname As String)
         Try
             Dim cmb As New ComboBox
             cmb.Name = cmbname
             cmb.Size = New Size(180, 24)
             cmb.Cursor = Cursors.Hand
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = Me.pnldesigner.PointToClient(Cursor.Position)
             cmb.Location = New Point(clientPosition)
             pnldesigner.Controls.Add(cmb)
             CURRENT_CONTROL = cmb
@@ -449,7 +486,7 @@
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, cmb.Name, "CMB", cmbname, cmb.Location.X, cmb.Location.Y, Environment.UserName, 24, 180)
             CURRENT_CONTROL.Tag = GetLastID()
-            Load_Control()
+            'Load_Control()
             btnsave.Visible = True
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen Combobox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -473,26 +510,23 @@
         SetMovementHandlers(dtp)
         btnsave.Visible = True
     End Function
-    Function add_newDTP(dtpname As String)
+    Function AddNewDatetimepicker(dtpname As String)
         Try
             Dim dtp As New DateTimePicker
             dtp.Name = dtpname
             dtp.Size = New Size(180, 24)
             dtp.Cursor = Cursors.Hand
             dtp.Format = DateTimePickerFormat.Short
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
+            Dim clientPosition As Point = Me.pnldesigner.PointToClient(Cursor.Position)
             dtp.Location = New Point(clientPosition)
             pnldesigner.Controls.Add(dtp)
             CURRENT_CONTROL = dtp
-            'AddHandler dtp.Click, AddressOf OndtpClick
-            'AddHandler dtp.MouseDown, AddressOf Movabledtp_MouseDown
-            'AddHandler dtp.MouseUp, AddressOf MovableCtrl_MouseUp
-            'AddHandler dtp.MouseMove, AddressOf Control_MouseMove 'Movabledtp_MouseMove
+
             SetMovementHandlers(dtp)
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dtp.Name, "DTP", dtpname, dtp.Location.X, dtp.Location.Y, Environment.UserName, 24, 180)
             CURRENT_CONTROL.Tag = GetLastID()
-            Load_Control()
+            'Load_Control()
 
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen DatetimePicker: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -514,15 +548,11 @@
 
         pnldesigner.Controls.Add(dgv)
 
-        'AddHandler dgv.Click, AddressOf OndgvClick
-        'AddHandler dgv.MouseDown, AddressOf MovableDGV_MouseDown
-        'AddHandler dgv.MouseUp, AddressOf MovableCtrl_MouseUp
-        'AddHandler dgv.MouseMove, AddressOf dgv_MouseMove
         SetMovementHandlers(dgv)
 
         btnsave.Visible = True
     End Function
-    Function add_newDGV(dgvName As String)
+    Function AddNewDGV(dgvName As String)
         Try
             Dim dgv As New DataGridView
             dgv.Name = dgvName
@@ -542,20 +572,16 @@
             pnldesigner.Controls.Add(dgv)
             CURRENT_CONTROL = dgv
 
-            'AddHandler dgv.Click, AddressOf OndgvClick
-            'AddHandler dgv.MouseDown, AddressOf MovableDGV_MouseDown
-            'AddHandler dgv.MouseUp, AddressOf MovableCtrl_MouseUp
-            'AddHandler dgv.MouseMove, AddressOf dgv_MouseMove
             SetMovementHandlers(dgv)
 
             TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dgv.Name, "DGV", dgvName, dgv.Location.X, dgv.Location.Y, Environment.UserName, 130, 150)
             CURRENT_CONTROL.Tag = GetLastID()
-            Load_Control()
+            'Load_Control()
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen DGV: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
     End Function
-    Function add_newTABLE(tableName As String)
+    Function AddNewTable(tableName As String)
         Try
             Dim table As New DataGridView
             table.Name = tableName
@@ -583,10 +609,6 @@
             pnldesigner.Controls.Add(table)
             CURRENT_CONTROL = table
 
-            'AddHandler table.Click, AddressOf OndgvClick
-            'AddHandler table.MouseDown, AddressOf MovableDGV_MouseDown
-            'AddHandler table.MouseUp, AddressOf MovableCtrl_MouseUp
-            'AddHandler table.MouseMove, AddressOf dgv_MouseMove
             SetMovementHandlers(table)
 
             AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
@@ -594,7 +616,7 @@
             CURRENT_CONTROL.Tag = GetLastID()
             TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column1", "Column1", 95, Environment.UserName)
             TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column2", "Column2", 95, Environment.UserName)
-            Load_Control()
+            'Load_Control()
         Catch ex As Exception
             MsgBox("Fehler bei Anlegen Tabelle: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -620,21 +642,15 @@
             Next
         End If
 
-        ' table.AutoResizeColumns()
-
         pnldesigner.Controls.Add(table)
 
-        'AddHandler table.Click, AddressOf OndgvClick
-        'AddHandler table.MouseDown, AddressOf MovableDGV_MouseDown
-        'AddHandler table.MouseUp, AddressOf MovableCtrl_MouseUp
-        'AddHandler table.MouseMove, AddressOf dgv_MouseMove
         SetMovementHandlers(table)
 
         AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
 
         btnsave.Visible = True
     End Function
-    Sub Set_Active_Color()
+    Sub SetActiveControlColor()
         CURRENT_CONTROL.BackColor = Color.DarkOrange
         For Each inctrl As Control In Me.pnldesigner.Controls
             If inctrl.Name <> CURRENT_CONTROL.Name Then
@@ -652,166 +668,45 @@
             End If
         Next
     End Sub
-    Public Sub OnlblClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Set_Active_Color()
-        Dim lbl As Label = sender
-        CURRENT_CONTROL = lbl
-        Load_Control()
-        lblBeschriftung.Visible = True
-        CTRL_TEXTTextBox.Visible = True
-        lblIndex.Visible = False
-
-        cmbIndex.Visible = False
-        rbIndex.Visible = False
-        rbVektor.Visible = False
-
-        VALIDATIONCheckBox.Visible = False
-        CheckBoxAuswahlliste.Visible = False
-        CHOICE_LISTTextBox.Visible = False
-        lblAuswahlliste.Visible = False
-        gbxControl.Visible = True
-
-        READ_ONLYCheckBox.Visible = False
-        LOAD_IDX_VALUECheckBox.Visible = False
-
-        INDEX_NAMETextBox.Visible = False
-    End Sub
-    Public Sub OntxtClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Dim txt As TextBox = sender
-        Set_Active_Color()
-
-
-        Load_indexe()
-        Load_Control()
-        Me.lblBeschriftung.Visible = False
-        Me.CTRL_TEXTTextBox.Visible = False
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-        Me.rbVektor.Visible = True
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.VALIDATIONCheckBox.Visible = True
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.CHOICE_LISTTextBox.Visible = False
-        Me.lblAuswahlliste.Visible = False
-
-        gbxControl.Visible = True
-        ' Me.pnlAuswahlliste.Enabled = False
-
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-    End Sub
-    Public Sub OnchkboxClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Dim chk As CheckBox = sender
-        Set_Active_Color()
-        CURRENT_CONTROL = chk
-        Load_indexe()
-        Load_Control()
-        Me.lblBeschriftung.Visible = True
-        Me.CTRL_TEXTTextBox.Visible = True
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-        Me.rbVektor.Visible = True
-        Me.VALIDATIONCheckBox.Visible = True
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.CHOICE_LISTTextBox.Visible = False
-        Me.lblAuswahlliste.Visible = False
-        gbxControl.Visible = True
-        ' Me.pnlAuswahlliste.Enabled = False
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-    End Sub
-    Public Sub OncmbClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Dim cmb As ComboBox = sender
-
-        Set_Active_Color()
-        Load_indexe()
-        Me.lblBeschriftung.Visible = False
-        Me.CTRL_TEXTTextBox.Visible = False
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-        Me.rbVektor.Visible = True
-        Me.CheckBoxAuswahlliste.Visible = True
-        Me.VALIDATIONCheckBox.Visible = True
-        gbxControl.Visible = True
-        If CHOICE_LISTTextBox.Text <> "" Then
-            CheckBoxAuswahlliste.Checked = True
-        Else
-            CheckBoxAuswahlliste.Checked = False
-        End If
-
-        '  Me.pnlAuswahlliste.Enabled = True
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-        Load_Control()
-
-    End Sub
-    Public Sub OndtpClick(sender As System.Object, e As System.EventArgs)
-
-        CURRENT_CONTROL = sender
-        Dim dtp As DateTimePicker = sender
-        CURRENT_CONTROL = dtp
-        Load_indexe()
-        Load_Control()
-        Me.lblBeschriftung.Visible = False
-        Me.CTRL_TEXTTextBox.Visible = False
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-        Me.rbVektor.Visible = True
-
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.VALIDATIONCheckBox.Visible = True
-        gbxControl.Visible = True
-        CHOICE_LISTTextBox.Visible = False
-        ' Me.pnlAuswahlliste.Enabled = False
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-    End Sub
-    Public Sub OndgvClick(sender As System.Object, e As System.EventArgs)
-        CURRENT_CONTROL = sender
-        Dim dgv As DataGridView = sender
-
-        CURRENT_CONTROL = dgv
-        If dgv.ColumnCount > 1 Then
-            Me.rbVektor.Visible = False
-            Load_Indexe_Vektor()
-            Dim selectedColumnCount As Integer = dgv.Columns.GetColumnCount(DataGridViewElementStates.Selected)
-            If selectedColumnCount > 0 Then
-                COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgv.SelectedColumns(selectedColumnCount).Name)
-            End If
-        Else
-            Load_indexe()
-            Me.rbVektor.Visible = True
-            COLUMN_GUID = Nothing
-        End If
-
 
-        Load_Control()
-        Me.lblBeschriftung.Visible = False
-        Me.CTRL_TEXTTextBox.Visible = False
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.CHOICE_LISTTextBox.Visible = False
-        Me.lblAuswahlliste.Visible = False
-
-        Me.VALIDATIONCheckBox.Visible = True
-
-        gbxControl.Visible = True
-        CHOICE_LISTTextBox.Visible = False
-        'Me.pnlAuswahlliste.Enabled = False
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
-    End Sub
+    'Public Sub OndgvClick(sender As System.Object, e As System.EventArgs)
+    '    CURRENT_CONTROL = sender
+    '    Dim dgv As DataGridView = sender
+
+    '    CURRENT_CONTROL = dgv
+    '    If dgv.ColumnCount > 1 Then
+    '        Me.rbVektor.Visible = False
+    '        Load_Indexe_Vektor()
+    '        Dim selectedColumnCount As Integer = dgv.Columns.GetColumnCount(DataGridViewElementStates.Selected)
+    '        If selectedColumnCount > 0 Then
+    '            COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgv.SelectedColumns(selectedColumnCount).Name)
+    '        End If
+    '    Else
+    '        Load_indexe()
+    '        Me.rbVektor.Visible = True
+    '        COLUMN_GUID = Nothing
+    '    End If
+
+
+    '    'Load_Control()
+    '    Me.lblBeschriftung.Visible = False
+    '    Me.CTRL_TEXTTextBox.Visible = False
+    '    Me.lblIndex.Visible = True
+    '    Me.cmbIndex.Visible = True
+    '    Me.rbIndex.Visible = True
+
+    '    Me.CheckBoxAuswahlliste.Visible = False
+    '    Me.CHOICE_LISTTextBox.Visible = False
+    '    Me.lblAuswahlliste.Visible = False
+
+    '    Me.VALIDATIONCheckBox.Visible = True
+
+    '    gbxControl.Visible = True
+    '    CHOICE_LISTTextBox.Visible = False
+    '    'Me.pnlAuswahlliste.Enabled = False
+    '    Me.READ_ONLYCheckBox.Visible = True
+    '    Me.LOAD_IDX_VALUECheckBox.Visible = True
+    'End Sub
     Public Sub table_ColumnHeaderMouseClick(sender As System.Object, e As DataGridViewCellMouseEventArgs)
         CURRENT_CONTROL = sender
         Dim dgv As DataGridView = sender
@@ -830,9 +725,7 @@
         frmTableColumn.FillData(COLUMN_GUID)
         frmTableColumn.Text = "Konfiguration von Spalte: " & dgvColumn.Name
 
-
-
-        Load_Control()
+        'Load_Control()
         Me.lblBeschriftung.Visible = True
         Me.CTRL_TEXTTextBox.Visible = True
         Me.lblIndex.Visible = True
@@ -892,117 +785,40 @@
 
         End Try
     End Sub
-    Private Sub MovableLabel_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
-            '  MsgBox(ex.Message)
-
-            Dim lbl As Label = DirectCast(sender, Label)
-            CURRENT_CONTROL = sender
-            BeginLocation = e.Location
-            lbl.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-        End If
-    End Sub
-    Private Sub MovableText_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
-
-            Dim txt As TextBox = DirectCast(sender, TextBox)
-            CURRENT_CONTROL = sender
-            BeginLocation = e.Location
-            txt.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-        End If
-    End Sub
-    Private Sub MovableChk_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
-            Dim txt As CheckBox = DirectCast(sender, CheckBox)
-            CURRENT_CONTROL = sender
-            BeginLocation = e.Location
-            txt.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-        End If
-    End Sub
-    Private Sub Movablecmb_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
-            Dim cmb As ComboBox = DirectCast(sender, ComboBox)
-            CURRENT_CONTROL = sender
-            BeginLocation = e.Location
-
-            cmb.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-        End If
-    End Sub
-    Private Sub Movabledtp_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left Then
-            Clear_control_Details()
-            Dim dtp As DateTimePicker = DirectCast(sender, DateTimePicker)
-            CURRENT_CONTROL = sender
-
-            'Console.WriteLine("X: " & cursor.X & ";Y=" & cursor.Y)
-            BeginLocation = e.Location
-            'begin_location = New Point(cursor.X - Parent.Location.X,
-            '             cursor.Y - Parent.Location.Y)
-            dtp.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-
-            'Jetzt Controleigenschaften laden
-            Load_Control()
-
-        End If
-    End Sub
-
-    Private Sub MovableDGV_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-        ' Check to see if the correct button has been pressed
-        If e.Button = Windows.Forms.MouseButtons.Left And Cursor = Cursors.Default Then
-            Clear_control_Details()
-            Dim dgv As DataGridView = DirectCast(sender, DataGridView)
-            Dim relativeMousePosition As Point = dgv.PointToClient(Cursor.Position)
-            Dim hit As DataGridView.HitTestInfo = dgv.HitTest(relativeMousePosition.X, relativeMousePosition.Y)
-            If hit.Type.ToString = "ColumnHeader" Then
-                Exit Sub
-            End If
-
-            CURRENT_CONTROL = sender
-
-            BeginLocation = e.Location
-            CURRENT_CONTROL.Tag = New clsDragInfo(Form.MousePosition, sender.Location)
-            dgv.BringToFront()
-            ' Set the mode flag to signal the MouseMove event handler that it
-            ' needs to now calculate new positions for our control
-            MouseMoving = True
-
-            CURRENT_CONTROL = sender
 
-            'Jetzt Controleigenschaften laden
-            Set_Active_Color()
-            Load_Control()
-
-            gbxControl.Visible = True
-        End If
-    End Sub
-
-    Private Sub btnsave_Click(sender As System.Object, e As System.EventArgs) Handles btnsave.Click
-        Save_Control()
-    End Sub
+    'Private Sub MovableDGV_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
+    '    ' Check to see if the correct button has been pressed
+    '    If e.Button = Windows.Forms.MouseButtons.Left And Cursor = Cursors.Default Then
+    '        Clear_control_Details()
+    '        Dim dgv As DataGridView = DirectCast(sender, DataGridView)
+    '        Dim relativeMousePosition As Point = dgv.PointToClient(Cursor.Position)
+    '        Dim hit As DataGridView.HitTestInfo = dgv.HitTest(relativeMousePosition.X, relativeMousePosition.Y)
+    '        If hit.Type.ToString = "ColumnHeader" Then
+    '            Exit Sub
+    '        End If
+
+    '        CURRENT_CONTROL = sender
+
+    '        BeginLocation = e.Location
+    '        CURRENT_CONTROL.Tag = New clsDragInfo(Form.MousePosition, sender.Location)
+    '        dgv.BringToFront()
+    '        ' Set the mode flag to signal the MouseMove event handler that it
+    '        ' needs to now calculate new positions for our control
+    '        MouseMoving = True
+
+    '        CURRENT_CONTROL = sender
+
+    '        'Jetzt Controleigenschaften laden
+    '        SetActiveControlColor()
+    '        'Load_Control()
+
+    '        gbxControl.Visible = True
+    '    End If
+    'End Sub
+
+    'Private Sub btnsave_Click(sender As System.Object, e As System.EventArgs) Handles btnsave.Click
+    '    Save_Control()
+    'End Sub
     Sub Save_Control()
         Try
             If rbVektor.Checked Then
@@ -1047,64 +863,63 @@
 
     End Sub
 
-    Private Sub cmbIndex_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles cmbIndex.SelectedIndexChanged
-        If cmbIndex.SelectedIndex <> -1 Then
-            If cmbIndex.Text = "DD PM-ONLY FOR DISPLAY" Then
-                LOAD_IDX_VALUECheckBox.Checked = False
-                LOAD_IDX_VALUECheckBox.Enabled = False
-                READ_ONLYCheckBox.Checked = True
-                VALIDATIONCheckBox.Checked = False
-                VALIDATIONCheckBox.Enabled = False
-            Else
-                LOAD_IDX_VALUECheckBox.Enabled = True
-                VALIDATIONCheckBox.Enabled = True
-            End If
-            If _loading = False Then
-                Save_Control()
-            End If
-        End If
-    End Sub
-    Private Sub btncmb_MouseMove(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btncmb.MouseMove
-        If MouseIsDown Then
-            ' Initiate dragging. 
-            btncmb.DoDragDrop("cmb", DragDropEffects.Copy)
-        End If
-        MouseIsDown = False
-    End Sub
-
-    Private Sub CheckBox1_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles CheckBoxAuswahlliste.CheckedChanged
-        If CheckBoxAuswahlliste.Checked Then
-            lblAuswahlliste.Visible = True
-            CHOICE_LISTTextBox.Visible = True
-        Else
-            lblAuswahlliste.Visible = False
-            CHOICE_LISTTextBox.Visible = False
-        End If
-    End Sub
-
-
-    Private Sub btndelete_Click(sender As System.Object, e As System.EventArgs) Handles btndelete.Click
+    'Private Sub cmbIndex_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles cmbIndex.SelectedIndexChanged
+    '    If cmbIndex.SelectedIndex <> -1 Then
+    '        If cmbIndex.Text = "DD PM-ONLY FOR DISPLAY" Then
+    '            LOAD_IDX_VALUECheckBox.Checked = False
+    '            LOAD_IDX_VALUECheckBox.Enabled = False
+    '            READ_ONLYCheckBox.Checked = True
+    '            VALIDATIONCheckBox.Checked = False
+    '            VALIDATIONCheckBox.Enabled = False
+    '        Else
+    '            LOAD_IDX_VALUECheckBox.Enabled = True
+    '            VALIDATIONCheckBox.Enabled = True
+    '        End If
+    '        If _loading = False Then
+    '            Save_Control()
+    '        End If
+    '    End If
+    'End Sub
+    'Private Sub btncmb_MouseMove(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btncmb.MouseMove
+    '    If MouseIsDown Then
+    '        ' Initiate dragging. 
+    '        btncmb.DoDragDrop("cmb", DragDropEffects.Copy)
+    '    End If
+    '    MouseIsDown = False
+    'End Sub
+
+    'Private Sub CheckBox1_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles CheckBoxAuswahlliste.CheckedChanged
+    '    If CheckBoxAuswahlliste.Checked Then
+    '        lblAuswahlliste.Visible = True
+    '        CHOICE_LISTTextBox.Visible = True
+    '    Else
+    '        lblAuswahlliste.Visible = False
+    '        CHOICE_LISTTextBox.Visible = False
+    '    End If
+    'End Sub
+
+
+    Private Sub btndelete_Click(sender As System.Object, e As EventArgs) Handles btndelete.Click
         If CURRENT_CONTROL Is Nothing = False Then
             delete_Control(CURRENT_CONTROL.Name)
         End If
     End Sub
 
-    Private Sub btnwidth_plus_Click(sender As System.Object, e As System.EventArgs) Handles btnwidth_plus.Click
+    Private Sub btnwidth_plus_Click(sender As System.Object, e As EventArgs) Handles btnwidth_plus.Click
         If CURRENT_CONTROL Is Nothing = False Then
             CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width + 5, CURRENT_CONTROL.Height)
             UpdateSingleValue("WIDTH", CURRENT_CONTROL.Size.Width)
         End If
-
     End Sub
 
-    Private Sub btnwidth_minus_Click(sender As System.Object, e As System.EventArgs) Handles btnwidth_minus.Click
+    Private Sub btnwidth_minus_Click(sender As System.Object, e As EventArgs) Handles btnwidth_minus.Click
         If CURRENT_CONTROL Is Nothing = False Then
             CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width - 5, CURRENT_CONTROL.Height)
             UpdateSingleValue("WIDTH", CURRENT_CONTROL.Size.Width)
         End If
     End Sub
 
-    Private Sub btnheight_plus_Click(sender As System.Object, e As System.EventArgs) Handles btnheight_plus.Click
+    Private Sub btnheight_plus_Click(sender As System.Object, e As EventArgs) Handles btnheight_plus.Click
         If CURRENT_CONTROL Is Nothing = False Then
             Dim newHeight As Integer = CURRENT_CONTROL.Height + 5
 
@@ -1116,7 +931,7 @@
         End If
     End Sub
 
-    Private Sub btnheight_minus_Click(sender As System.Object, e As System.EventArgs) Handles btnheight_minus.Click
+    Private Sub btnheight_minus_Click(sender As System.Object, e As EventArgs) Handles btnheight_minus.Click
         If CURRENT_CONTROL Is Nothing = False Then
             Dim newHeight As Integer = CURRENT_CONTROL.Height - 5
 
@@ -1128,7 +943,7 @@
         End If
     End Sub
 
-    Private Sub Button2_MouseMove(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btndtp.MouseMove
+    Private Sub Button2_MouseMove(sender As System.Object, e As MouseEventArgs) Handles btndtp.MouseMove
         If MouseIsDown Then
             'Initiate dragging. 
             btndtp.DoDragDrop("dtp", DragDropEffects.Copy)
@@ -1160,29 +975,29 @@
         MouseIsDown = False
     End Sub
 
-    Private Sub rbIndex_CheckedChanged(sender As Object, e As EventArgs) Handles rbIndex.CheckedChanged
-        If rbIndex.Checked Then
-            Me.cmbIndex.Visible = True
-            Me.INDEX_NAMETextBox.Visible = False
-            Me.lblIndex.Text = "Zugeordneter Index"
-        Else
-            Me.cmbIndex.Visible = False
-            Me.INDEX_NAMETextBox.Visible = True
-            Me.lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
-        End If
-    End Sub
-
-    Private Sub rbVektor_CheckedChanged(sender As Object, e As EventArgs) Handles rbVektor.CheckedChanged
-        If rbVektor.Checked Then
-            Me.INDEX_NAMETextBox.Visible = True
-            Me.cmbIndex.Visible = False
-            Me.lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
-        Else
-            Me.INDEX_NAMETextBox.Visible = False
-            Me.cmbIndex.Visible = True
-            Me.lblIndex.Text = "Zugeordneter Index"
-        End If
-    End Sub
+    'Private Sub rbIndex_CheckedChanged(sender As Object, e As EventArgs) Handles rbIndex.CheckedChanged
+    '    If rbIndex.Checked Then
+    '        cmbIndex.Visible = True
+    '        INDEX_NAMETextBox.Visible = False
+    '        lblIndex.Text = "Zugeordneter Index"
+    '    Else
+    '        cmbIndex.Visible = False
+    '        INDEX_NAMETextBox.Visible = True
+    '        lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
+    '    End If
+    'End Sub
+
+    'Private Sub rbVektor_CheckedChanged(sender As Object, e As EventArgs) Handles rbVektor.CheckedChanged
+    '    If rbVektor.Checked Then
+    '        Me.INDEX_NAMETextBox.Visible = True
+    '        Me.cmbIndex.Visible = False
+    '        Me.lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
+    '    Else
+    '        Me.INDEX_NAMETextBox.Visible = False
+    '        Me.cmbIndex.Visible = True
+    '        Me.lblIndex.Text = "Zugeordneter Index"
+    '    End If
+    'End Sub
 
     Private Sub INDEX_NAMETextBox_Leave(sender As Object, e As EventArgs) Handles INDEX_NAMETextBox.Leave
         If INDEX_NAMETextBox.Text <> "" And CURRENT_CONTROL_ID <> 0 Then
@@ -1230,7 +1045,7 @@
             CURRENT_SQL_CON = CONID
             frmSQL_DESIGNER.ShowDialog()
 
-            Load_Control(CURRENT_CONTROL_ID)
+            'Load_Control(CURRENT_CONTROL_ID)
             TabControlEigenschaften.SelectedIndex = 2
         Else
             MsgBox("Please choose a control!", MsgBoxStyle.Information)
@@ -1250,8 +1065,6 @@
         AddHandler control.MouseMove, AddressOf OnControl_MouseMove
     End Sub
 
-
-
     Private Sub OnControl_MouseDown(sender As Control, e As MouseEventArgs)
         If e.Button = MouseButtons.Left Then
             CURRENT_CONTROL = sender
@@ -1314,6 +1127,8 @@
         obj.Location = New Point(row.Item("X_LOC"), row.Item("Y_LOC"))
         obj.Name = row.Item("NAME")
         obj.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+        obj.ChangedAt = NotNull(row.Item("CHANGED_WHEN"), Nothing)
+        obj.ChangedWho = NotNull(row.Item("CHANGED_WHO"), "")
 
         Dim style As FontStyle = NotNull(row.Item("FONT_STYLE"), FontStyle.Regular)
         Dim size As Single = NotNull(row.Item("FONT_SIZE"), 10)
@@ -1354,16 +1169,20 @@
                                               Return r.Item("GUID") = sender.Tag
                                           End Function).Single()
 
+        ' Globale Variablen setzen
         CURRENT_CONTROL = sender
         CURRENT_CONTROL_ID = sender.Tag
 
-        Set_Active_Color()
+        SetActiveControlColor()
 
         gbxControl.Visible = True
 
-        Dim indicies As List(Of String) = _windreamPM.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
-        Dim choiceLists As List(Of String) = DD_LIB_Standards.clsWD_GET.GetChoiceLists()
+        'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden
+        Dim indicies As List(Of String) = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
+        Dim choiceLists As List(Of String) = clsWD_GET.GetChoiceLists()
 
+        ' Mithilfe von CreatePropsObject(WithIndicies) wird ein Basis Objekt mit grundlegenden
+        ' Eigenschaften angelegt. Danach können für jeden Control Typ spezifische Eigenschaften festgelegt werden.
         If TypeOf sender Is Label Then
             Dim label As Label = sender
             Dim labelProps As LabelProperties = CreatePropsObject(New LabelProperties, row)
@@ -1405,6 +1224,7 @@
             Exit Sub
         End If
 
+        ' Zum Schluss wird das Eigenschaften-Objekt ins PropertyGrid geladen
         pgControls.SelectedObject = props
     End Sub
 
@@ -1437,12 +1257,12 @@
                 CURRENT_CONTROL.Size = newValue
 
             Case "Width"
-                UpdateSingleValue("WIDTH", DirectCast(newValue, Size).Width)
+                UpdateSingleValue("WIDTH", CInt(newValue))
 
                 CURRENT_CONTROL.Size = New Size(newValue, CURRENT_CONTROL.Size.Height)
 
             Case "Height"
-                UpdateSingleValue("HEIGHT", DirectCast(newValue, Size).Height)
+                UpdateSingleValue("HEIGHT", CInt(newValue))
 
                 CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Size.Width, newValue)
 
@@ -1492,6 +1312,7 @@
         Dim guid As Integer = CURRENT_CONTROL_ID
         Dim escapedValue = value
 
+        ' Strings und SQL-Commands müssen vor dem speichern escaped und mit Anführungszeichen versehen werden
         If TypeOf value Is String Then
             escapedValue = $"'{value}'"
         ElseIf TypeOf value Is InputProperties.SQLValue Then
@@ -1499,10 +1320,16 @@
             escapedValue = $"'{v.Value.Replace("'", "''")}'"
         End If
 
-        ClassDatabase.Execute_non_Query($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue} WHERE GUID = {guid}")
+        Try
+            ClassDatabase.Execute_non_Query($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue} WHERE GUID = {guid}")
 
-        tslblAenderungen.Visible = True
-        tslblAenderungen.Text = "Änderungen gespeichert - " & Now
+            tslblAenderungen.Visible = True
+            tslblAenderungen.Text = "Änderungen gespeichert - " & Now
+        Catch ex As Exception
+            Dim msg = $"Fehler beim Speichern von Control (Id: {guid}): {vbCrLf}{ex.Message}"
+            MsgBox(msg)
+            ClassLogger.Add(msg)
+        End Try
     End Sub
 #End Region
 End Class
\ No newline at end of file
diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index f0f14b2..7de7212 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -661,7 +661,6 @@ Public Class frmMain
 
     End Sub
 
-
     Private Sub ToolStripButton1_Click(sender As System.Object, e As System.EventArgs) Handles ToolStripButton1.Click
         Try
             frmKonfig.ShowDialog()
diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index 37ff265..fce8dce 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -290,11 +290,11 @@ Public Class frmValidator
         sumatra = False
         If My.Settings.frmValidatorPosition.IsEmpty = False Then
             If My.Settings.frmValidatorPosition.X > 0 And My.Settings.frmValidatorPosition.Y > 0 Then
-                Me.Location = My.Settings.frmValidatorPosition
+                Location = My.Settings.frmValidatorPosition
             End If
         End If
         If My.Settings.frmValidatorSize.IsEmpty = False Then
-            Me.Size = My.Settings.frmValidatorSize
+            Size = My.Settings.frmValidatorSize
         End If
         Try
             DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID)
@@ -304,14 +304,14 @@ Public Class frmValidator
             TBPM_PROFILE_FILESTableAdapter.Connection.ConnectionString = MyConnectionString
             TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Connection.ConnectionString = MyConnectionString
             TBPM_PROFILETableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString
+            TBPM_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString
             VWPM_CONTROL_INDEXTableAdapter.Connection.ConnectionString = MyConnectionString
             VWPM_PROFILE_USERTableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = MyConnectionString
-            Me.VWPM_PROFILE_USERTableAdapter.FillByName(Me.DD_DMSLiteDataSet.VWPM_PROFILE_USER, CURRENT_ProfilName, Environment.UserName)
+            TBPM_CONTROL_TABLETableAdapter.Connection.ConnectionString = MyConnectionString
+            VWPM_PROFILE_USERTableAdapter.FillByName(DD_DMSLiteDataSet.VWPM_PROFILE_USER, CURRENT_ProfilName, Environment.UserName)
 
-            Me.VWPM_CONTROL_INDEXTableAdapter.Fill(Me.DD_DMSLiteDataSet.VWPM_CONTROL_INDEX, CURRENT_ProfilName)
-            Me.TBPM_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONNECTION)
+            VWPM_CONTROL_INDEXTableAdapter.Fill(DD_DMSLiteDataSet.VWPM_CONTROL_INDEX, CURRENT_ProfilName)
+            TBPM_CONNECTIONTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_CONNECTION)
             If LogErrorsOnly = False Then ClassLogger.Add(" >> Profile Data geladen", False)
         Catch ex As Exception
             MsgBox("Error LOADING profile-data:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:")
@@ -368,9 +368,9 @@ Public Class frmValidator
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> PROFIL_sortbynewest: " & PROFIL_sortbynewest.ToString, False)
                     'Delete Button anzeigen ja/nein
                     If Right_Delete = True Then
-                        Me.ToolStripButtonDeleteFile.Enabled = True
+                        ToolStripButtonDeleteFile.Enabled = True
                     Else
-                        Me.ToolStripButtonDeleteFile.Enabled = False
+                        ToolStripButtonDeleteFile.Enabled = False
                     End If
 
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> Right_Delete: " & Right_Delete.ToString, False)
@@ -405,37 +405,291 @@ Public Class frmValidator
         End Try
     End Sub
 
+    Sub ComboBoxData(profileId As Integer, controlName As String)
+        ' Informationen über Profil und Control holen
+        Dim ControlId As Integer = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(profileId, controlName)
+        Dim ConnectionId As Integer
+        Dim SQLCommand As String
+
+        If ControlId = 0 Then
+            Exit Sub
+        End If
+
+        ConnectionId = TBPM_PROFILE_CONTROLSTableAdapter.cmdgetConnectionID(ControlId)
+
+        If ConnectionId = 0 Then
+            Exit Sub
+        End If
+
+        SQLCommand = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlId)
+
+        If SQLCommand = String.Empty Then
+            Exit Sub
+        End If
+
+        TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBPM_CONNECTION, ConnectionId)
+
+        Dim connectionString As String
+
+        For Each row As DataRow In DD_DMSLiteDataSet.TBPM_CONNECTION.Rows
+            Select Case row.Item("SQL_PROVIDER").ToString().ToLower()
+                Case "ms-sql"
+                    If row.Item("USERNAME") = "WINAUTH" Then
+                        connectionString = $"Data Source={row.Item("SERVER")};Initial Catalog=${row.Item("DATENBANK")};Trusted_Connection=True;"
+                    Else
+                        connectionString = $"Data Source={row.Item("SERVER")};Initial Catalog=${row.Item("DATENBANK")};User Id={row.Item("USERNAME")};Password={row.Item("PASSWORD")}"
+                    End If
+                Case "oracle"
+                    Dim csBuilder As New OracleConnectionStringBuilder()
+
+                    If row.Item("SERVER") <> String.Empty And Not IsDBNull(row.Item("SERVER")) Then
+                        connectionString = $"""
+                            Data Source=(
+                                DESCRIPTION=
+                                    ADDRESS_LIST=
+                                        (ADDRESS=
+                                            (PROTOCOL=TCP)
+                                            (HOST={row.Item("SERVER")})
+                                            (PORT=1521)
+                                        )
+                                    )
+                                    (CONNECT_DATA=
+                                        (SERVER=DEDICATED)
+                                        (SERVICE_NAME={row.Item("DATENBANK")})
+                                    )
+                               );User Id={row.Item("USERNAME")};Password={row.Item("PASSWORD")}
+                        """
+                    Else
+                        csBuilder.DataSource = row.Item("SERVER")
+                        csBuilder.UserID = row.Item("USERNAME")
+                        csBuilder.Password = row.Item("PASSWORD")
+                        csBuilder.PersistSecurityInfo = True
+                        csBuilder.ConnectionTimeout = 120
+
+                        connectionString = csBuilder.ConnectionString
+                    End If
+                Case Else
+                    Exit Sub
+            End Select
+        Next
+
+        Dim items As New List(Of String)
+
+        Using adapter As New SqlClient.SqlDataAdapter()
+            Using conn As New SqlClient.SqlConnection(connectionString)
+                conn.Open()
+
+                Using cmd As New SqlClient.SqlCommand(SQLCommand, conn)
+
+                    Dim dataSet As New DataSet()
+
+                    adapter.SelectCommand = cmd
+                    adapter.Fill(dataSet)
+
+                    Dim table = dataSet.Tables(0)
+
+                    For Each row As DataRow In table.Rows
+                        items.Add(row.Item(0))
+                    Next
+                End Using
+            End Using
+        End Using
+
+
+
+    End Sub
+
     Sub Load_Controls()
         Try
             pnldesigner.Controls.Clear()
-            Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX
+            'Dim dt As DataTable = DD_DMSLiteDataSet.VWPM_CONTROL_INDEX
+
+            TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_ProfilGUID)
+            Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS
+
             For Each dr As DataRow In dt.Rows
+                Dim ctrl As Control
+
                 Select Case dr.Item("CTRL_TYPE").ToString.ToUpper
                     Case "TXT"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch TXT zu laden", False)
-                        add_textbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
+                        Dim txt As TextBox = ClassControlCreator.CreateExistingTextbox(dr, False)
+
+                        AddHandler txt.GotFocus, AddressOf OnTextBoxFocus
+                        AddHandler txt.LostFocus, AddressOf OnTextBoxLostFocus
+                        AddHandler txt.KeyUp, AddressOf OnTextBoxKeyUp
+
+                        ctrl = txt
+
+                        'add_textbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "LBL"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch LBL zu laden", False)
-                        add_label(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")))
+                        ctrl = ClassControlCreator.CreateExistingLabel(dr, False)
+
+                        'add_label(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")))
                     Case "CMB"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch CMB zu laden", False)
-                        add_ComboBox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
+
+                        Dim cmb = ClassControlCreator.CreateExistingCombobox(dr, False)
+
+                        AddHandler cmb.SelectedValueChanged, AddressOf OnCmbselectedIndex
+
+#Region "CONTROL LIST"
+
+                        Dim ControlID = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, cmb.Name)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_ComboBox - GUID: " & ControlID, False)
+                        If ControlID > 0 Then
+                            If LogErrorsOnly = False Then ClassLogger.Add(" >>ControlID > 0", False)
+                            Dim ConID = Me.TBPM_PROFILE_CONTROLSTableAdapter.cmdgetConnectionID(ControlID)
+                            If ConID Is Nothing = False Then
+                                Dim commandsql = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> ConID Is Nothing = False", False)
+                                If ConID > 0 And commandsql <> "" Then
+                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)", False)
+                                    Dim connectionString As String
+                                    TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBPM_CONNECTION, ConID)
+                                    Dim DTConnection As DataTable = DD_DMSLiteDataSet.TBPM_CONNECTION
+                                    Dim drConnection As DataRow
+                                    For Each drConnection In DTConnection.Rows
+                                        Select Case drConnection.Item("SQL_PROVIDER").ToString.ToLower
+                                            Case "ms-sql"
+                                                If drConnection.Item("USERNAME") = "WINAUTH" Then
+                                                    connectionString = "Data Source=" & drConnection.Item("SERVER") & ";Initial Catalog=" & drConnection.Item("DATENBANK") & ";Trusted_Connection=True;"
+                                                Else
+                                                    connectionString = "Data Source=" & drConnection.Item("SERVER") & ";Initial Catalog= " & drConnection.Item("DATENBANK") & ";User Id=" & drConnection.Item("USERNAME") & ";Password=" & drConnection.Item("PASSWORD") & ";"
+                                                End If
+                                                If LogErrorsOnly = False Then ClassLogger.Add(" >> ConnString Sql-Server:  " & connectionString)
+                                            Case "oracle"
+                                                Dim conn As New OracleConnectionStringBuilder
+                                                Dim connstr As String
+                                                If drConnection.Item("SERVER") <> "" And drConnection.Item("DATENBANK").GetType.ToString <> "system.dbnull" Then
+                                                    connstr = "Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=" & drConnection.Item("SERVER") & ")(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=" &
+                                        drConnection.Item("DATENBANK") & ")));User Id=" & drConnection.Item("USERNAME") & ";Password=" & drConnection.Item("PASSWORD") & ";"
+                                                Else
+                                                    conn.DataSource = drConnection.Item("SERVER")
+                                                    conn.UserID = drConnection.Item("USERNAME")
+                                                    conn.Password = drConnection.Item("PASSWORD")
+                                                    conn.PersistSecurityInfo = True
+                                                    conn.ConnectionTimeout = 120
+                                                    connstr = conn.ConnectionString
+                                                End If
+
+                                                connectionString = connstr
+                                            Case Else
+                                                ClassLogger.Add(" - ConnectionType nicht integriert", False)
+                                                MsgBox("ConnectionType nicht integriert", MsgBoxStyle.Critical, "Bitte Konfiguration Connection überprüfen!")
+                                        End Select
+                                    Next
+                                    If connectionString Is Nothing = False Then
+                                        Try
+                                            Dim sqlCnn As SqlClient.SqlConnection
+                                            Dim sqlCmd As SqlClient.SqlCommand
+                                            Dim adapter As New SqlClient.SqlDataAdapter
+                                            Dim NewDataset As New DataSet
+                                            Dim i As Integer
+                                            Dim sql As String
+
+
+                                            sql = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)
+                                            sqlCnn = New SqlClient.SqlConnection(connectionString)
+                                            ' Try
+                                            sqlCnn.Open()
+                                            sqlCmd = New SqlClient.SqlCommand(sql, sqlCnn)
+                                            adapter.SelectCommand = sqlCmd
+                                            adapter.Fill(NewDataset)
+                                            Dim msg As String
+                                            For i = 0 To NewDataset.Tables(0).Rows.Count - 1
+                                                cmb.Items.Add(NewDataset.Tables(0).Rows(i).Item(0))
+                                            Next
+                                            adapter.Dispose()
+                                            sqlCmd.Dispose()
+                                            sqlCnn.Close()
+                                        Catch ex As Exception
+                                            ClassLogger.Add(" - Unvorhergesehener Fehler bei GetValues SQL - Fehler: " & vbNewLine & ex.Message)
+                                            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler bei GetValues SQL:")
+                                        End Try
+                                    End If
+                                Else
+                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Else Row 571", False)
+                                End If
+                            Else
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> AListe Handling", False)
+                                Dim AListe As String = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetChoiceListName(ControlID)
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_ComboBox - AListe: " & AListe, False)
+                                If AListe Is Nothing = False Then
+                                    Dim liste = _windream.GetValuesfromAuswahlliste(AListe)
+                                    If liste IsNot Nothing Then
+                                        cmb.Items.Add("")
+                                        For Each index As String In liste
+                                            cmb.Items.Add(index)
+                                        Next
+                                        cmb.SelectedIndex = -1
+                                    Else
+                                        MsgBox("Resultliste windream is nothing!", MsgBoxStyle.Exclamation, AListe)
+                                    End If
+                                Else
+                                    MsgBox("AListe from database is nothing!", MsgBoxStyle.Exclamation, AListe)
+                                End If
+                            End If
+
+
+                        End If
+#End Region
+
+                        Dim maxWith As Integer = cmb.Width
+                        Using g As Graphics = Me.CreateGraphics
+                            For Each oItem As Object In cmb.Items 'Für alle Einträge...
+                                Dim g1 As Graphics = cmb.CreateGraphics
+                                If g1.MeasureString(Text, cmb.Font).Width + 30 > maxWith Then
+                                    maxWith = g1.MeasureString(Text, cmb.Font).Width + 30
+                                End If
+                                g1.Dispose()
+                            Next oItem
+                        End Using
+                        cmb.DropDownWidth = maxWith
+
+                        ctrl = cmb
+
+                        'add_ComboBox(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "DTP"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch DTP zu laden", False)
+                        ctrl = ClassControlCreator.CreateExistingDatepicker(dr, False)
+
                         add_DTP(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "DGV"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch DGV zu laden", False)
-                        add_DGV(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("HEIGHT"), dr.Item("WIDTH"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
+                        Dim dgv = ClassControlCreator.CreateExistingDataGridView(dr, False)
+
+                        AddHandler dgv.RowValidating, AddressOf onDGVRowValidating
+
+                        ctrl = dgv
+
+                        'add_DGV(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("HEIGHT"), dr.Item("WIDTH"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "CHK"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch Checkbox zu laden", False)
-                        add_Checkbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE"))
+
+                        ctrl = ClassControlCreator.CreateExisingCheckbox(dr, False)
+                        'add_Checkbox(dr.Item("GUID"), dr.Item("CTRL_NAME"), dr.Item("CTRL_TEXT"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE"))
                     Case "TABLE"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch Tabelle zu laden", False)
-                        add_TABLE(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("WIDTH"), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"))
+
+                        Dim columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow) = (From r As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In DD_DMSLiteDataSet.TBPM_CONTROL_TABLE
+                                                                                           Where r.CONTROL_ID = dr.Item("GUID")
+                                                                                           Select r).ToList()
+
+                        ctrl = ClassControlCreator.CreateExistingTable(dr, columns, False)
+                        'add_TABLE(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("WIDTH"), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"))
                 End Select
+
+                If first_control Is Nothing Then
+                    first_control = ctrl
+                End If
+                last_control = ctrl
+
+                pnldesigner.Controls.Add(ctrl)
+
             Next
             If LogErrorsOnly = False Then ClassLogger.Add(" >> Controls geladen", False)
-            If LogErrorsOnly = False Then ClassLogger.Add(" >> Controls geladen", False)
             ClassLogger.Add("", False)
 
         Catch ex As Exception
@@ -448,18 +702,18 @@ Public Class frmValidator
 
     End Sub
 
-    Function add_label(CONTROL_ID As Integer, lblname As String, text As String, x As Integer, y As Integer)
-        If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_label - lblname: " & lblname & " x/y: " & x.ToString & "/" & y.ToString, False)
-        Dim lbl As New Label
-        lbl.Name = lblname
-        lbl.Text = text
-        lbl.AutoSize = True
-        lbl.Tag = CONTROL_ID
-        'lbl.Size = New Size(CInt(lbl.Text.Length * 10), 16)
-        lbl.Location = New Point(x, y)
-        pnldesigner.Controls.Add(lbl)
-        If LogErrorsOnly = False Then ClassLogger.Add(" >> LBL: " & lblname & " hinzugefügt", False)
-    End Function
+    'Function add_label(CONTROL_ID As Integer, lblname As String, text As String, x As Integer, y As Integer)
+    '    If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_label - lblname: " & lblname & " x/y: " & x.ToString & "/" & y.ToString, False)
+    '    Dim lbl As New Label
+    '    lbl.Name = lblname
+    '    lbl.Text = text
+    '    lbl.AutoSize = True
+    '    lbl.Tag = CONTROL_ID
+    '    'lbl.Size = New Size(CInt(lbl.Text.Length * 10), 16)
+    '    lbl.Location = New Point(x, y)
+    '    pnldesigner.Controls.Add(lbl)
+    '    If LogErrorsOnly = False Then ClassLogger.Add(" >> LBL: " & lblname & " hinzugefügt", False)
+    'End Function
     Function add_textbox(CONTROL_ID As Integer, ByVal txtname As String, ByVal x As Integer, ByVal y As Integer, ByVal width As Integer, ByVal height As Integer, ByVal read_only As Boolean, loadindex As Boolean) 'idxName As String, 
         If LogErrorsOnly = False Then ClassLogger.Add(" >> In add_textbox - txtname: " & txtname & " x/y: " & x.ToString & "/" & y.ToString, False)
         Dim txt As New TextBox
@@ -515,8 +769,8 @@ Public Class frmValidator
                 If ConID > 0 And commandsql <> "" Then
                     If LogErrorsOnly = False Then ClassLogger.Add(" >> CConID > 0 And TBPM_PROFILE_CONTROLSTableAdapter.cmdGetSQL(ControlID)", False)
                     Dim connectionString As String
-                    Me.TBPM_CONNECTIONTableAdapter.FillByID(Me.DD_DMSLiteDataSet.TBPM_CONNECTION, ConID)
-                    Dim DT As DataTable = Me.DD_DMSLiteDataSet.TBPM_CONNECTION
+                    TBPM_CONNECTIONTableAdapter.FillByID(DD_DMSLiteDataSet.TBPM_CONNECTION, ConID)
+                    Dim DT As DataTable = DD_DMSLiteDataSet.TBPM_CONNECTION
                     Dim drConnection As DataRow
                     For Each drConnection In DT.Rows
                         Select Case drConnection.Item("SQL_PROVIDER").ToString.ToLower
@@ -763,7 +1017,7 @@ Public Class frmValidator
 
     End Sub
 
-    Public Sub OnTextBoxFocus(sender As System.Object, e As System.EventArgs)
+    Public Sub OnTextBoxFocus(sender As Object, e As EventArgs)
         Dim box As TextBox = sender
         box.BackColor = Color.Lime
         box.SelectAll()
@@ -811,21 +1065,21 @@ Public Class frmValidator
                                     ' Regulären Ausdruck zum Auslesen der Indexe definieren
                                     Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
                                     ' einen Regulären Ausdruck laden
-                                    Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
+                                    Dim regulärerAusdruck As Text.RegularExpressions.Regex = New Text.RegularExpressions.Regex(preg)
                                     ' die Vorkommen im SQL-String auslesen
-                                    Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(sql_Statement)
+                                    Dim elemente As Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(sql_Statement)
                                     '####
                                     ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
-                                    For Each element As System.Text.RegularExpressions.Match In elemente
+                                    For Each element As Text.RegularExpressions.Match In elemente
                                         Try
                                             If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX: " & element.Value, False)
                                             Dim MyPattern = element.Value.Substring(2, element.Value.Length - 3)
                                             Dim input_value
                                             If MyPattern.Contains("txt") Then
-                                                Dim txt As TextBox = CType(Me.pnldesigner.Controls(MyPattern), TextBox)
+                                                Dim txt As TextBox = CType(pnldesigner.Controls(MyPattern), TextBox)
                                                 input_value = txt.Text
                                             ElseIf MyPattern.Contains("cmb") Then
-                                                Dim cmb As ComboBox = CType(Me.pnldesigner.Controls(MyPattern), ComboBox)
+                                                Dim cmb As ComboBox = CType(pnldesigner.Controls(MyPattern), ComboBox)
                                                 input_value = cmb.Text
                                             End If
                                             sql_Statement = sql_Statement.ToString.Replace(element.Value, input_value)
@@ -1892,121 +2146,121 @@ Public Class frmValidator
             'lblerror.Visible = False
             'Try
             Dim _error As Boolean = False
-                Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
-                Dim dtfinal As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_FINAL_INDEXING
-                If dtfinal.Rows.Count > 0 Then
-                    'Jetzt finale Indexe setzen
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Finale(r) Index(e) für Dok: " & aktivesDokument.aName & " soll gesetzt werden", False)
-                    For Each dr As DataRow In dtfinal.Rows
-                        Dim value As String = dr.Item("VALUE").ToString
-                        If value.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexierung mit dynamischem SQL!", False)
-                            Dim SQL_COMMAND = dr.Item("SQL_COMMAND")
-                            ' Regulären Ausdruck zum Auslesen der Indexe definieren
-                            Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
-                            ' einen Regulären Ausdruck laden
-                            Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
-                            ' die Vorkommen im SQL-String auslesen
-                            Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(SQL_COMMAND)
-                            '####
-                            ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
-                            For Each element As System.Text.RegularExpressions.Match In elemente
-                                Try
-                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX: " & element.Value, False)
-                                    Dim WDINDEXNAME = element.Value.Substring(2, element.Value.Length - 3)
-                                    Dim wertWD = aktivesDokument.GetVariableValue(WDINDEXNAME)
-                                    If Not IsNothing(wertWD) Then
-                                        SQL_COMMAND = SQL_COMMAND.ToString.Replace(element.Value, wertWD)
-                                    Else
-                                        ClassLogger.Add(">> Achtung Indexwert ist nothing!", False)
-                                    End If
-                                Catch ex As Exception
-                                    ClassLogger.Add("Unexpected Error in Checking control values for Variable SQL Result - ERROR: " & ex.Message)
-                                End Try
-                            Next
-                            Dim dynamic_value = ClassDatabase.Execute_Scalar(SQL_COMMAND, MyConnectionString, True)
-                            If Not IsNothing(dynamic_value) Then
-                                value = dynamic_value
-                            End If
-                        Else
-                            If value.StartsWith("v") Then
-                                Select Case dr.Item("VALUE").ToString
-                                    Case "vDate"
-                                        value = Now.ToShortDateString
-                                    Case "vUserName"
-                                        value = Environment.UserName
-                                    Case Else
-                                        value = dr.Item("VALUE")
-                                End Select
-                            End If
+            Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_PROFILE_FINAL_INDEXING, CURRENT_ProfilName)
+            Dim dtfinal As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_FINAL_INDEXING
+            If dtfinal.Rows.Count > 0 Then
+                'Jetzt finale Indexe setzen
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Finale(r) Index(e) für Dok: " & aktivesDokument.aName & " soll gesetzt werden", False)
+                For Each dr As DataRow In dtfinal.Rows
+                    Dim value As String = dr.Item("VALUE").ToString
+                    If value.ToUpper = "SQL-Command".ToUpper Then '###### Indexierung mit variablen SQL ###
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Indexierung mit dynamischem SQL!", False)
+                        Dim SQL_COMMAND = dr.Item("SQL_COMMAND")
+                        ' Regulären Ausdruck zum Auslesen der Indexe definieren
+                        Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
+                        ' einen Regulären Ausdruck laden
+                        Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
+                        ' die Vorkommen im SQL-String auslesen
+                        Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(SQL_COMMAND)
+                        '####
+                        ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
+                        For Each element As System.Text.RegularExpressions.Match In elemente
+                            Try
+                                If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX: " & element.Value, False)
+                                Dim WDINDEXNAME = element.Value.Substring(2, element.Value.Length - 3)
+                                Dim wertWD = aktivesDokument.GetVariableValue(WDINDEXNAME)
+                                If Not IsNothing(wertWD) Then
+                                    SQL_COMMAND = SQL_COMMAND.ToString.Replace(element.Value, wertWD)
+                                Else
+                                    ClassLogger.Add(">> Achtung Indexwert ist nothing!", False)
+                                End If
+                            Catch ex As Exception
+                                ClassLogger.Add("Unexpected Error in Checking control values for Variable SQL Result - ERROR: " & ex.Message)
+                            End Try
+                        Next
+                        Dim dynamic_value = ClassDatabase.Execute_Scalar(SQL_COMMAND, MyConnectionString, True)
+                        If Not IsNothing(dynamic_value) Then
+                            value = dynamic_value
+                        End If
+                    Else
+                        If value.StartsWith("v") Then
+                            Select Case dr.Item("VALUE").ToString
+                                Case "vDate"
+                                    value = Now.ToShortDateString
+                                Case "vUserName"
+                                    value = Environment.UserName
+                                Case Else
+                                    value = dr.Item("VALUE")
+                            End Select
                         End If
+                    End If
 
-                        Dim result() As String
-                        ReDim Preserve result(0)
-                        result(0) = value
+                    Dim result() As String
+                    ReDim Preserve result(0)
+                    result(0) = value
 
-                        If dr.Item("INDEXNAME").ToString.StartsWith("[%VKT") Then
-                            Dim PM_String = Return_PM_VEKTOR(value, dr.Item("INDEXNAME"))
-                            'Hier muss nun separat als Vektorfeld indexiert werden
-                            If Indexiere_VektorfeldPM(PM_String, PROFIL_VEKTORINDEX) = False Then
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> FINALER INDEX '" & dr.Item("INDEXNAME").ToString.Replace("[%VKT", "") & "' WURDE ERFOLGREICH GESETZT", False)
-                            Else
-                                errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
-                                My.Settings.Save()
-                                frmError.ShowDialog()
-                                _error = True
-                            End If
+                    If dr.Item("INDEXNAME").ToString.StartsWith("[%VKT") Then
+                        Dim PM_String = Return_PM_VEKTOR(value, dr.Item("INDEXNAME"))
+                        'Hier muss nun separat als Vektorfeld indexiert werden
+                        If Indexiere_VektorfeldPM(PM_String, PROFIL_VEKTORINDEX) = False Then
+                            If LogErrorsOnly = False Then ClassLogger.Add(" >> FINALER INDEX '" & dr.Item("INDEXNAME").ToString.Replace("[%VKT", "") & "' WURDE ERFOLGREICH GESETZT", False)
                         Else
-                            If LogErrorsOnly = False Then ClassLogger.Add(" >> Jetzt das indexieren", False)
-                            If Indexiere_File(aktivesDokument, dr.Item("INDEXNAME"), result) = True Then
-                                If LogErrorsOnly = False Then ClassLogger.Add(" >> FINALER INDEX '" & dr.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT", False)
-                                If LogErrorsOnly = False Then ClassLogger.Add("")
-                                'Nun das Logging
-                                If PROFIL_LOGINDEX <> "" Then
-                                    Dim logstr = Return_LOGString(value, "DDFINALINDEX", dr.Item("INDEXNAME"))
-                                    Indexiere_VektorfeldPM(logstr, PROFIL_LOGINDEX)
-                                End If
-
-                            Else
-                                errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
-                                My.Settings.Save()
-                                frmError.ShowDialog()
-                                _error = True
-                            End If
-                        End If
-                        If _error = True Then
-                            Exit For
+                            errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
+                            My.Settings.Save()
+                            frmError.ShowDialog()
+                            _error = True
                         End If
-                    Next
-                End If
-                'Wenn kein Fehler nach der finalen Indexierung gesetzt wurde
-                If _error = False Then
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Tabelle updaten und co", False)
-                    'Das Dokument freigeben und als editiert markieren
-                    Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", Environment.UserName, CURRENT_DOC_GUID)
-                    ClassDatabase.Execute_non_Query(sql)
-                    'TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(False, "", Document_ID)
-                    ''Das Dokument 
-                    'TBPM_PROFILE_FILESTableAdapter.CmdSetEdit(Document_ID)
-                    Dim WORK_HISTORY_ENTRY = Nothing
+                    Else
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Jetzt das indexieren", False)
+                        If Indexiere_File(aktivesDokument, dr.Item("INDEXNAME"), result) = True Then
+                            If LogErrorsOnly = False Then ClassLogger.Add(" >> FINALER INDEX '" & dr.Item("INDEXNAME") & "' WURDE ERFOLGREICH GESETZT", False)
+                            If LogErrorsOnly = False Then ClassLogger.Add("")
+                            'Nun das Logging
+                            If PROFIL_LOGINDEX <> "" Then
+                                Dim logstr = Return_LOGString(value, "DDFINALINDEX", dr.Item("INDEXNAME"))
+                                Indexiere_VektorfeldPM(logstr, PROFIL_LOGINDEX)
+                            End If
 
-                    Try
-                        WORK_HISTORY_ENTRY = DTPROFIL.Rows(0).Item("WORK_HISTORY_ENTRY")
-                        If IsDBNull(WORK_HISTORY_ENTRY) Then
-                            WORK_HISTORY_ENTRY = Nothing
+                        Else
+                            errormessage = "Fehler beim finalen Indexieren:" & vbNewLine & idxerr_message
+                            My.Settings.Save()
+                            frmError.ShowDialog()
+                            _error = True
                         End If
-                    Catch ex As Exception
+                    End If
+                    If _error = True Then
+                        Exit For
+                    End If
+                Next
+            End If
+            'Wenn kein Fehler nach der finalen Indexierung gesetzt wurde
+            If _error = False Then
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Tabelle updaten und co", False)
+                'Das Dokument freigeben und als editiert markieren
+                Dim sql = String.Format("UPDATE TBPM_PROFILE_FILES SET IN_WORK = 0, WORK_USER = '{0}', EDIT = 1 WHERE GUID = {1}", Environment.UserName, CURRENT_DOC_GUID)
+                ClassDatabase.Execute_non_Query(sql)
+                'TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(False, "", Document_ID)
+                ''Das Dokument 
+                'TBPM_PROFILE_FILESTableAdapter.CmdSetEdit(Document_ID)
+                Dim WORK_HISTORY_ENTRY = Nothing
+
+                Try
+                    WORK_HISTORY_ENTRY = DTPROFIL.Rows(0).Item("WORK_HISTORY_ENTRY")
+                    If IsDBNull(WORK_HISTORY_ENTRY) Then
                         WORK_HISTORY_ENTRY = Nothing
-                    End Try
+                    End If
+                Catch ex As Exception
+                    WORK_HISTORY_ENTRY = Nothing
+                End Try
 
 
-                    If Not IsNothing(WORK_HISTORY_ENTRY) Then
-                        If WORK_HISTORY_ENTRY <> String.Empty Then
-                            Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
-                            ' einen Regulären Ausdruck laden
-                            Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
-                            ' die Vorkommen im SQL-String auslesen
-                            Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(WORK_HISTORY_ENTRY)
+                If Not IsNothing(WORK_HISTORY_ENTRY) Then
+                    If WORK_HISTORY_ENTRY <> String.Empty Then
+                        Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
+                        ' einen Regulären Ausdruck laden
+                        Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
+                        ' die Vorkommen im SQL-String auslesen
+                        Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(WORK_HISTORY_ENTRY)
                         '####
                         ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
                         For Each element As System.Text.RegularExpressions.Match In elemente
@@ -2070,15 +2324,15 @@ Public Class frmValidator
                             WORK_HISTORY_ENTRY.ToString.Replace("@USERNAME", Environment.UserName)
                         End If
                     Else
-                            WORK_HISTORY_ENTRY = ""
-                        End If
+                        WORK_HISTORY_ENTRY = ""
                     End If
-                    Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, Environment.UserName, Environment.MachineName, WORK_HISTORY_ENTRY)
-                    ClassDatabase.Execute_non_Query(ins)
+                End If
+                Dim ins = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY,WORKED_WHERE,STATUS_COMMENT) VALUES ({0},{1},'{2}','{3}','{4}')", CURRENT_ProfilGUID, CURRENT_DOC_ID, Environment.UserName, Environment.MachineName, WORK_HISTORY_ENTRY)
+                ClassDatabase.Execute_non_Query(ins)
 
-                    Close_document_viewer()
-                    If Document_Path.ToLower.EndsWith(".pdf") Then
-                        If Not IsNothing(WORK_HISTORY_ENTRY) Then
+                Close_document_viewer()
+                If Document_Path.ToLower.EndsWith(".pdf") Then
+                    If Not IsNothing(WORK_HISTORY_ENTRY) Then
                         If CBool(DTPROFIL.Rows(0).Item("ANNOTATE_WORK_HISTORY_ENTRY")) = True Then
                             sql = String.Format("SELECT * FROM TBPM_FILES_WORK_HISTORY WHERE GUID = (SELECT MAX(GUID) FROM TBPM_FILES_WORK_HISTORY WHERE PROFIL_ID = {0} AND DOC_ID = {1})", CURRENT_ProfilGUID, CURRENT_DOC_ID)
                             Dim DT_ENTRY As DataTable = ClassDatabase.Return_Datatable(sql, True)
@@ -2104,46 +2358,46 @@ Public Class frmValidator
                             End If
                         End If
                     End If
-                    End If
-
-                    'wenn Move2Folder aktiviert wurde
-                    If Move2Folder <> "" Then
-                        idxerr_message = allgFunk.Move2Folder(Document_Path, Move2Folder, CURRENT_ProfilGUID)
-                        If idxerr_message <> "" Then
-                            errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message
-                            My.Settings.Save()
-                            frmError.ShowDialog()
-                            _error = True
-                        End If
-                    End If
-                    'Validierungsfile löschen wenn vorhanden
-                    allgFunk.Delete_xffres(Document_Path)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Delete_xffres ausgeführt", False)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> All Input clear", False)
-                    Anzahl_validierte_Dok += 1
-                    'tstrlbl_Info.Text = "Anzahl Dateien: " & TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(PROFIL_ID)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl hochgesetzt", False)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Validierung erfolgreich abgeschlossen", False)
-                    ClassLogger.Add("", False)
-                    If CURRENT_JUMP_DOC_GUID <> 0 Then
-                        Me.Close()
-                    Else
-                        'Das nächste Dokument laden
-                        Load_Next_Document(False)
+                End If
 
-                        set_foreground()
-                        If first_control Is Nothing = False Then first_control.Focus()
+                'wenn Move2Folder aktiviert wurde
+                If Move2Folder <> "" Then
+                    idxerr_message = allgFunk.Move2Folder(Document_Path, Move2Folder, CURRENT_ProfilGUID)
+                    If idxerr_message <> "" Then
+                        errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message
+                        My.Settings.Save()
+                        frmError.ShowDialog()
+                        _error = True
                     End If
+                End If
+                'Validierungsfile löschen wenn vorhanden
+                allgFunk.Delete_xffres(Document_Path)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Delete_xffres ausgeführt", False)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> All Input clear", False)
+                Anzahl_validierte_Dok += 1
+                'tstrlbl_Info.Text = "Anzahl Dateien: " & TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(PROFIL_ID)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl hochgesetzt", False)
+                If LogErrorsOnly = False Then ClassLogger.Add(" >> Validierung erfolgreich abgeschlossen", False)
+                ClassLogger.Add("", False)
+                If CURRENT_JUMP_DOC_GUID <> 0 Then
+                    Me.Close()
+                Else
+                    'Das nächste Dokument laden
+                    Load_Next_Document(False)
 
+                    set_foreground()
+                    If first_control Is Nothing = False Then first_control.Focus()
                 End If
 
-                'Catch ex As Exception
-                '    errormessage = "Unvorhergesehener Fehler bei Abschluss:" & ex.Message
-                '    My.Settings.Save()
-                '    frmError.ShowDialog()
-                '    ClassLogger.Add(">> Unvorhergesehener Fehler bei Abschluss: " & ex.Message, True)
-                'End Try
-                Else
+            End If
+
+            'Catch ex As Exception
+            '    errormessage = "Unvorhergesehener Fehler bei Abschluss:" & ex.Message
+            '    My.Settings.Save()
+            '    frmError.ShowDialog()
+            '    ClassLogger.Add(">> Unvorhergesehener Fehler bei Abschluss: " & ex.Message, True)
+            'End Try
+        Else
             'lblerror.Visible = True
             'lblerror.Text = errmessage
             errormessage = errmessage

From 1237dcad0c4888d9b3b7faca44a9bcacdd2f8335 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Thu, 29 Mar 2018 16:06:15 +0200
Subject: [PATCH 02/14] JJ: BAUSTELLE FormDesigner

---
 app/DD_PM_WINDREAM/ClassControlCreator.vb     |  98 ++++++-
 .../frmFormDesigner.Designer.vb               |   2 +-
 app/DD_PM_WINDREAM/frmFormDesigner.resx       |  12 +
 app/DD_PM_WINDREAM/frmFormDesigner.vb         | 241 ++++++++++++------
 4 files changed, 271 insertions(+), 82 deletions(-)

diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb
index 692440b..ecb081c 100644
--- a/app/DD_PM_WINDREAM/ClassControlCreator.vb
+++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb
@@ -5,7 +5,7 @@ Public Class ClassControlCreator
     ''' <summary>
     ''' Konstanten
     ''' </summary>
-    Private Const LABEL_TEXT = "Bezeichnung definieren"
+    Private Const DEFAULT_TEXT = "Bezeichnung definieren"
 
     Private Const DEFAULT_FONT_SIZE As Integer = 10
     Private Const DEFAULT_FONT_FAMILY As String = "Arial"
@@ -13,8 +13,15 @@ Public Class ClassControlCreator
     Private Const DEFAULT_COLOR As Integer = 0
     Private Const DEFAULT_WIDTH As Integer = 170
     Private Const DEFAULT_HEIGHT As Integer = 20
+    Private Const DEFAULT_HEIGHT_TABLE As Integer = 150
 
     Private Const PREFIX_TEXTBOX = "TXT"
+    Private Const PREFIX_LABEL = "LBL"
+    Private Const PREFIX_CHECKBOX = "CHK"
+    Private Const PREFIX_COMBOBOX = "CMB"
+    Private Const PREFIX_DATETIMEPICKER = "DTP"
+    Private Const PREFIX_DATAGRIDVIEW = "DGV"
+    Private Const PREFIX_TABLE = "TB"
 
     ''' <summary>
     ''' Standard Eigenschaften für alle Controls
@@ -75,7 +82,96 @@ Public Class ClassControlCreator
         }
 
         Return control
+    End Function
+
+    Public Shared Function CreateNewLabel(location As Point) As Label
+        Dim control As New Label With {
+            .Name = $"{PREFIX_LABEL}_{clsTools.ShortGUID}",
+            .Text = DEFAULT_TEXT,
+            .AutoSize = True,
+            .Location = location,
+            .Cursor = Cursors.Hand
+        }
+
+        Return control
+    End Function
+
+    Public Shared Function CreateNewCheckbox(location As Point) As CheckBox
+        Dim control As New CheckBox With {
+            .Name = $"{PREFIX_CHECKBOX}_{clsTools.ShortGUID}",
+            .AutoSize = True,
+            .Text = DEFAULT_TEXT,
+            .Cursor = Cursors.Hand,
+            .Location = location
+        }
+
+        Return control
+    End Function
+
+    Public Shared Function CreateNewCombobox(location As Point) As ComboBox
+        Dim control As New ComboBox With {
+            .Name = $"{PREFIX_COMBOBOX}_{clsTools.ShortGUID}",
+            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
+            .Cursor = Cursors.Hand,
+            .Location = location
+           }
+
+        Return control
+    End Function
 
+    Public Shared Function CreateNewDatetimepicker(location As Point) As DateTimePicker
+        Dim control As New DateTimePicker With {
+            .Name = $"{PREFIX_DATETIMEPICKER}_{clsTools.ShortGUID}",
+            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT),
+            .Cursor = Cursors.Hand,
+            .Location = location,
+            .Format = DateTimePickerFormat.Short
+        }
+
+        Return control
+    End Function
+
+    Public Shared Function CreateNewDatagridview(location As Point) As DataGridView
+        Dim control As New DataGridView With {
+            .Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGUID}",
+            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
+            .Cursor = Cursors.Hand,
+            .AllowUserToAddRows = False,
+            .AllowUserToDeleteRows = False,
+            .AllowUserToResizeColumns = False,
+            .AllowUserToResizeRows = False
+        }
+
+        control.Columns.Add(New DataGridViewTextBoxColumn With {
+            .HeaderText = "",
+            .Name = "column1"
+        })
+
+        Return control
+    End Function
+
+    Public Shared Function CreateNewTable(location As Point) As DataGridView
+        Dim control As New DataGridView With {
+            .Name = $"{PREFIX_TABLE}_{clsTools.ShortGUID}",
+            .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
+            .Cursor = Cursors.Hand,
+            .AllowUserToAddRows = False,
+            .AllowUserToDeleteRows = False,
+            .AllowUserToResizeColumns = False,
+            .AllowUserToResizeRows = False
+        }
+
+        control.Columns.Add(New DataGridViewTextBoxColumn With {
+            .HeaderText = "Column1",
+            .Name = "column1"
+        })
+
+        control.Columns.Add(New DataGridViewTextBoxColumn With {
+            .HeaderText = "Column2",
+            .Name = "column2"
+        })
+
+        Return control
     End Function
 
     ' ----------------------- EXISITING CONTROLS -----------------------
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
index f2e3e25..4b16540 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
@@ -313,7 +313,6 @@ Partial Class frmFormDesigner
         Me.gbxControl.TabIndex = 4
         Me.gbxControl.TabStop = False
         Me.gbxControl.Text = "Controleigenschaften:"
-        Me.gbxControl.Visible = False
         '
         'TabControlEigenschaften
         '
@@ -324,6 +323,7 @@ Partial Class frmFormDesigner
         Me.TabControlEigenschaften.Controls.Add(Me.pageFormat)
         Me.TabControlEigenschaften.Controls.Add(Me.pageSQL)
         Me.TabControlEigenschaften.Controls.Add(Me.pagePropertiesOld)
+        Me.TabControlEigenschaften.Enabled = False
         Me.TabControlEigenschaften.Location = New System.Drawing.Point(12, 22)
         Me.TabControlEigenschaften.Name = "TabControlEigenschaften"
         Me.TabControlEigenschaften.SelectedIndex = 0
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx
index 832da02..2d14d4f 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.resx
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx
@@ -137,18 +137,30 @@
   <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>179, 17</value>
   </metadata>
+  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>179, 17</value>
+  </metadata>
+  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
   <metadata name="TBPM_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1021, 17</value>
   </metadata>
+  <metadata name="TBPM_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1021, 17</value>
+  </metadata>
   <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>898, 56</value>
   </metadata>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>904, 17</value>
   </metadata>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>898, 56</value>
+  </metadata>
   <metadata name="TBPM_PROFILE_CONTROLSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>458, 17</value>
   </metadata>
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index 326ae81..5ca3924 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -14,9 +14,14 @@ Public Class frmFormDesigner
     Private CURRENT_CONTROL As Control
 
     ' Movement Variables
-    Private MouseMoving As Boolean
-    Private BeginLocation As Point
-    Private EndLocation As Point
+    Private Mouse_IsPressed As Boolean
+    Private Mouse_IsMoving As Boolean
+    Private Mouse_BeginLocation As Point
+    Private Mouse_EndLocation As Point
+
+    ' Windream List Data
+    Private Windream_ChoiceLists As List(Of String)
+    Private Windream_Indicies As List(Of String)
 
     Private Sub frmFormDesigner_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
         If CURRENT_ProfilGUID > 0 Then
@@ -53,12 +58,18 @@ Public Class frmFormDesigner
             'löscht alle Controls
             pnldesigner.Controls.Clear()
             CURRENT_CONTROL = Nothing
+
             Try
                 ' Windream initialisieren
                 clsWindream.Create_Session()
+
+                'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden
+                Windream_Indicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
+                Windream_ChoiceLists = clsWD_GET.GetChoiceLists()
             Catch ex As Exception
                 MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
             End Try
+
             Try
                 TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = MyConnectionString
                 TBPM_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
@@ -256,6 +267,8 @@ Public Class frmFormDesigner
                                                                                            Select r).ToList()
                         Dim table = ClassControlCreator.CreateExistingTable(row, columns, True)
 
+                        AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
+
                         pnldesigner.Controls.Add(table)
                         SetMovementHandlers(table)
                 End Select
@@ -302,50 +315,103 @@ Public Class frmFormDesigner
         End If
     End Sub
 
-    Private Sub btnlabel_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove
-        If MouseIsDown Then
-            ' Initiate dragging. 
-            btnlabel.DoDragDrop("lbl", DragDropEffects.Copy)
-        End If
-        MouseIsDown = False
-    End Sub
+    Private Sub pnlDesigner_DragDrop(sender As Object, e As DragEventArgs) Handles pnldesigner.DragDrop
+        Dim cursorPosition As Point = pnldesigner.PointToClient(Cursor.Position)
 
-    Private Sub btntextbox_MouseMove(sender As Object, e As MouseEventArgs) Handles btntextbox.MouseMove
-        If MouseIsDown Then
-            ' Initiate dragging. 
-            btntextbox.DoDragDrop("txt", DragDropEffects.Copy)
-        End If
-        MouseIsDown = False
-    End Sub
-
-    Private Sub Panel2_DragDrop(sender As Object, e As System.Windows.Forms.DragEventArgs) Handles pnldesigner.DragDrop
-        Dim r As New Random()
-        Dim random As Integer = r.Next(8, 100)
         Select Case e.Data.GetData(DataFormats.Text)
             Case "lbl"
-                'idxlbl += 1
-                AddNewLabel("lbl" & random.ToString)
+                Dim label = ClassControlCreator.CreateNewLabel(cursorPosition)
+                SetMovementHandlers(label)
+
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, Environment.UserName, label.Size.Height, label.Size.Width)
+
+                CURRENT_CONTROL = label
+                CURRENT_CONTROL.Tag = GetLastID()
+
+                pnldesigner.Controls.Add(label)
+
+                'AddNewLabel("lbl" & Random.ToString)
             Case "txt"
-                'idxtxt += 1
-                AddNewTextbox("txt" & random)
+                Dim txt = ClassControlCreator.CreateNewTextBox(cursorPosition)
+                SetMovementHandlers(txt)
+
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, Environment.UserName, txt.Size.Height, txt.Size.Width)
+
+                CURRENT_CONTROL = txt
+                CURRENT_CONTROL.Tag = GetLastID()
+
+                pnldesigner.Controls.Add(txt)
+
+                'AddNewTextbox("txt" & Random)
             Case "cmb"
-                'idxcmb += 1
-                AddNewCombobox("cmb" & random)
+                Dim cmb = ClassControlCreator.CreateNewCombobox(cursorPosition)
+                SetMovementHandlers(cmb)
+
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, Environment.UserName, cmb.Size.Height, cmb.Size.Width)
+
+                CURRENT_CONTROL = cmb
+                CURRENT_CONTROL.Tag = GetLastID()
+
+                pnldesigner.Controls.Add(cmb)
+
+                'AddNewCombobox("cmb" & random)
             Case "dtp"
-                'idxdtp += 1
-                AddNewDatetimepicker("dtp" & random)
-            Case "dgv"
-                'idxdgv += 1
-                AddNewDGV("dgv" & random)
+                Dim dtp = ClassControlCreator.CreateNewDatetimepicker(cursorPosition)
+                SetMovementHandlers(dtp)
+
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, Environment.UserName, dtp.Size.Height, dtp.Size.Width)
+
+                CURRENT_CONTROL = dtp
+                CURRENT_CONTROL.Tag = GetLastID()
+
+                pnldesigner.Controls.Add(dtp)
+
+                'AddNewDatetimepicker("dtp" & random)
             Case "chk"
-                ' idxchk += 1
-                AddNewCheckbox("chk" & random)
+                Dim chk = ClassControlCreator.CreateNewCheckbox(cursorPosition)
+                SetMovementHandlers(chk)
+
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, Environment.UserName, chk.Size.Height, chk.Size.Width)
+
+                CURRENT_CONTROL = chk
+                CURRENT_CONTROL.Tag = GetLastID()
+
+                pnldesigner.Controls.Add(chk)
+
+                'AddNewCheckbox("chk" & random)
+            Case "dgv"
+                Dim dgv = ClassControlCreator.CreateNewDatagridview(cursorPosition)
+                SetMovementHandlers(dgv)
+
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dgv.Name, "DGV", dgv.Name, dgv.Location.X, dgv.Location.Y, Environment.UserName, dgv.Size.Height, dgv.Size.Width)
+
+                CURRENT_CONTROL = dgv
+                CURRENT_CONTROL.Tag = GetLastID()
+
+                pnldesigner.Controls.Add(dgv)
+
+                'AddNewDGV("dgv" & random)
             Case "tb"
-                AddNewTable("tb" & random)
+                Dim tb = ClassControlCreator.CreateNewTable(cursorPosition)
+
+                SetMovementHandlers(tb)
+                AddHandler tb.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
+
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, Environment.UserName, tb.Size.Height, tb.Size.Width)
+
+                CURRENT_CONTROL = tb
+                CURRENT_CONTROL.Tag = GetLastID()
+
+                TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column1", "Column1", 95, Environment.UserName)
+                TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column2", "Column2", 95, Environment.UserName)
+
+                pnldesigner.Controls.Add(tb)
+
+                'AddNewTable("tb" & Random)
         End Select
     End Sub
 
-    Private Sub Panel2_DragEnter(sender As System.Object, e As System.Windows.Forms.DragEventArgs) Handles pnldesigner.DragEnter
+    Private Sub pnlDesigner_DragEnter(sender As System.Object, e As System.Windows.Forms.DragEventArgs) Handles pnldesigner.DragEnter
         ' Check the format of the data being dropped. 
         If (e.Data.GetDataPresent(DataFormats.Text)) Then
             ' Display the copy cursor. 
@@ -364,34 +430,34 @@ Public Class frmFormDesigner
             Return 0
         End Try
     End Function
-    Function AddNewLabel(lblname As String)
-        Try
-            Dim lbl As New Label
-            lbl.Name = lblname
-            lbl.Text = "Bez. definieren"
-            lbl.AutoSize = True
-            Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
-            lbl.Location = New Point(clientPosition)
-            pnldesigner.Controls.Add(lbl)
-            CURRENT_CONTROL = lbl
-
-            SetMovementHandlers(lbl)
-
-            TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, lbl.Name, "LBL", lblname, lbl.Location.X, lbl.Location.Y, Environment.UserName, 16, 200)
-            CURRENT_CONTROL.Tag = GetLastID()
-            'Load_Control()
-            btnsave.Visible = True
-        Catch ex As Exception
-            MsgBox("Fehler bei Anlegen Label: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Function
-    Function AddExistingLabel(lbl As Label, text As String)
-        lbl.Text = text
-        lbl.AutoSize = True
-
-        pnldesigner.Controls.Add(lbl)
-        SetMovementHandlers(lbl)
-    End Function
+    'Function AddNewLabel(lblname As String)
+    '    Try
+    '        Dim lbl As New Label
+    '        lbl.Name = lblname
+    '        lbl.Text = "Bez. definieren"
+    '        lbl.AutoSize = True
+    '        Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
+    '        lbl.Location = New Point(clientPosition)
+    '        pnldesigner.Controls.Add(lbl)
+    '        CURRENT_CONTROL = lbl
+
+    '        SetMovementHandlers(lbl)
+
+    '        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, lbl.Name, "LBL", lblname, lbl.Location.X, lbl.Location.Y, Environment.UserName, 16, 200)
+    '        CURRENT_CONTROL.Tag = GetLastID()
+    '        'Load_Control()
+    '        btnsave.Visible = True
+    '    Catch ex As Exception
+    '        MsgBox("Fehler bei Anlegen Label: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+    '    End Try
+    'End Function
+    'Function AddExistingLabel(lbl As Label, text As String)
+    '    lbl.Text = text
+    '    lbl.AutoSize = True
+
+    '    pnldesigner.Controls.Add(lbl)
+    '    SetMovementHandlers(lbl)
+    'End Function
 
     Private Function GetLastID()
         Dim sql = String.Format("SELECT MAX(GUID) FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0}", CURRENT_ProfilGUID)
@@ -902,6 +968,7 @@ Public Class frmFormDesigner
     Private Sub btndelete_Click(sender As System.Object, e As EventArgs) Handles btndelete.Click
         If CURRENT_CONTROL Is Nothing = False Then
             delete_Control(CURRENT_CONTROL.Name)
+            TabControlEigenschaften.Enabled = False
         End If
     End Sub
 
@@ -1068,22 +1135,25 @@ Public Class frmFormDesigner
     Private Sub OnControl_MouseDown(sender As Control, e As MouseEventArgs)
         If e.Button = MouseButtons.Left Then
             CURRENT_CONTROL = sender
-            BeginLocation = e.Location
+            Mouse_BeginLocation = e.Location
             sender.BringToFront()
-            MouseMoving = True
+
+            Mouse_IsPressed = True
 
             Console.WriteLine("CURRENT_CONTROL:" & CURRENT_CONTROL.Name)
         End If
     End Sub
 
     Private Sub OnControl_MouseUp(sender As Control, e As MouseEventArgs)
-        If MouseMoving Then
-            MouseMoving = False
-            EndLocation = e.Location
+        Mouse_IsPressed = False
+
+        If Mouse_IsMoving Then
+            Mouse_IsMoving = False
 
-            Dim CurrentPosition As Point = DirectCast(pgControls.SelectedObject, BaseProperties).Location
+            Dim CurrentPosition = CURRENT_CONTROL.Location
+            Dim OldPosition As Point = DirectCast(pgControls.SelectedObject, BaseProperties).Location
 
-            If Point.op_Inequality(CurrentPosition, EndLocation) Then
+            If Point.op_Inequality(CurrentPosition, OldPosition) Then
                 DirectCast(pgControls.SelectedObject, BaseProperties).Location = CURRENT_CONTROL.Location
 
                 UpdateSingleValue("X_LOC", CURRENT_CONTROL.Location.X)
@@ -1100,18 +1170,21 @@ Public Class frmFormDesigner
                 Exit Sub
             End If
 
-            If MouseMoving Then
+            Mouse_IsMoving = True
+            Console.WriteLine("Mouse Moving!")
+
+            If Mouse_IsPressed Then
                 Cursor = Cursors.Hand
                 Refresh()
 
                 Dim CurrentPosition As Point = GetCursorPosition()
 
-                If Point.op_Inequality(CurrentPosition, BeginLocation) Then
-                    CURRENT_CONTROL.Location = New Point(CurrentPosition.X - BeginLocation.X, CurrentPosition.Y - BeginLocation.Y)
+                If Point.op_Inequality(CurrentPosition, Mouse_BeginLocation) Then
+                    CURRENT_CONTROL.Location = New Point(CurrentPosition.X - Mouse_BeginLocation.X, CurrentPosition.Y - Mouse_BeginLocation.Y)
                 End If
             End If
         Catch ex As Exception
-            MouseMoving = False
+            Mouse_IsMoving = False
         End Try
     End Sub
 
@@ -1165,9 +1238,17 @@ Public Class frmFormDesigner
     Private Sub OnControl_Click(sender As Control, e As MouseEventArgs)
         Dim props
         Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS
-        Dim row = dt.AsEnumerable().Where(Function(r As DataRow)
-                                              Return r.Item("GUID") = sender.Tag
-                                          End Function).Single()
+        Dim row As DataRow
+
+        TabControlEigenschaften.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
+        TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_ProfilGUID)
+
+        row = dt.AsEnumerable().Where(Function(r As DataRow)
+                                          Return r.Item("GUID") = sender.Tag
+                                      End Function).Single()
 
         ' Globale Variablen setzen
         CURRENT_CONTROL = sender
@@ -1321,12 +1402,12 @@ Public Class frmFormDesigner
         End If
 
         Try
-            ClassDatabase.Execute_non_Query($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue} WHERE GUID = {guid}")
+            ClassDatabase.Execute_non_Query($"UPDATE TBPM_PROFILE_CONTROLS SET {columnName} = {escapedValue}, CHANGED_WHO = '{Environment.UserName}' WHERE GUID = {guid}")
 
             tslblAenderungen.Visible = True
             tslblAenderungen.Text = "Änderungen gespeichert - " & Now
         Catch ex As Exception
-            Dim msg = $"Fehler beim Speichern von Control (Id: {guid}): {vbCrLf}{ex.Message}"
+            Dim msg = $"UpdateSingleValue - Fehler beim Speichern von Control (Id: {guid}): {vbCrLf}{ex.Message}"
             MsgBox(msg)
             ClassLogger.Add(msg)
         End Try

From d56367db0771af0ae2141ac429180d5478a8bd59 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 3 Apr 2018 10:25:44 +0200
Subject: [PATCH 03/14] jj: Control Properties bei MouseUp Laden

---
 app/DD_PM_WINDREAM/frmFormDesigner.vb | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index 5ca3924..b9fa7b4 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -718,6 +718,8 @@ Public Class frmFormDesigner
     End Function
     Sub SetActiveControlColor()
         CURRENT_CONTROL.BackColor = Color.DarkOrange
+
+        ' Reset Color of all other controls
         For Each inctrl As Control In Me.pnldesigner.Controls
             If inctrl.Name <> CURRENT_CONTROL.Name Then
                 Dim Type As String = inctrl.GetType.ToString
@@ -1126,7 +1128,6 @@ Public Class frmFormDesigner
     ''' </summary>
     ''' <param name="control">Das Control, für das die Eventhandler gesetzt werden sollen</param>
     Private Sub SetMovementHandlers(control As Control)
-        AddHandler control.Click, AddressOf OnControl_Click
         AddHandler control.MouseDown, AddressOf OnControl_MouseDown
         AddHandler control.MouseUp, AddressOf OnControl_MouseUp
         AddHandler control.MouseMove, AddressOf OnControl_MouseMove
@@ -1147,6 +1148,12 @@ Public Class frmFormDesigner
     Private Sub OnControl_MouseUp(sender As Control, e As MouseEventArgs)
         Mouse_IsPressed = False
 
+        ' Ersten Tab anzeigen
+        TabControlEigenschaften.SelectTab(0)
+
+        ' Control Eigenschaften laden
+        LoadControlProperties(sender)
+
         If Mouse_IsMoving Then
             Mouse_IsMoving = False
 
@@ -1171,7 +1178,6 @@ Public Class frmFormDesigner
             End If
 
             Mouse_IsMoving = True
-            Console.WriteLine("Mouse Moving!")
 
             If Mouse_IsPressed Then
                 Cursor = Cursors.Hand
@@ -1235,7 +1241,7 @@ Public Class frmFormDesigner
         Return obj
     End Function
 
-    Private Sub OnControl_Click(sender As Control, e As MouseEventArgs)
+    Private Sub LoadControlProperties(sender As Control)
         Dim props
         Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS
         Dim row As DataRow

From f83d5aea45eb33fced4e6dcbaf3506e3796df9ef Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 3 Apr 2018 14:51:35 +0200
Subject: [PATCH 04/14] jj: Neues Control Linie, form Designer entschlacken

---
 app/DD_PM_WINDREAM/ClassControlCreator.vb     |   80 +-
 app/DD_PM_WINDREAM/ModuleControlProperties.vb |   23 +-
 .../frmFormDesigner.Designer.vb               |  556 +-------
 app/DD_PM_WINDREAM/frmFormDesigner.resx       |   27 +-
 app/DD_PM_WINDREAM/frmFormDesigner.vb         | 1116 ++++-------------
 app/DD_PM_WINDREAM/frmProfileDesigner.vb      |    5 +
 app/DD_PM_WINDREAM/frmValidator.Designer.vb   |    3 +-
 app/DD_PM_WINDREAM/frmValidator.vb            |    6 +-
 8 files changed, 372 insertions(+), 1444 deletions(-)

diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb
index ecb081c..7b14251 100644
--- a/app/DD_PM_WINDREAM/ClassControlCreator.vb
+++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb
@@ -15,13 +15,14 @@ Public Class ClassControlCreator
     Private Const DEFAULT_HEIGHT As Integer = 20
     Private Const DEFAULT_HEIGHT_TABLE As Integer = 150
 
-    Private Const PREFIX_TEXTBOX = "TXT"
-    Private Const PREFIX_LABEL = "LBL"
-    Private Const PREFIX_CHECKBOX = "CHK"
-    Private Const PREFIX_COMBOBOX = "CMB"
-    Private Const PREFIX_DATETIMEPICKER = "DTP"
-    Private Const PREFIX_DATAGRIDVIEW = "DGV"
-    Private Const PREFIX_TABLE = "TB"
+    Public Const PREFIX_TEXTBOX = "TXT"
+    Public Const PREFIX_LABEL = "LBL"
+    Public Const PREFIX_CHECKBOX = "CHK"
+    Public Const PREFIX_COMBOBOX = "CMB"
+    Public Const PREFIX_DATETIMEPICKER = "DTP"
+    Public Const PREFIX_DATAGRIDVIEW = "DGV"
+    Public Const PREFIX_TABLE = "TB"
+    Public Const PREFIX_LINE = "LINE"
 
     ''' <summary>
     ''' Standard Eigenschaften für alle Controls
@@ -57,7 +58,7 @@ Public Class ClassControlCreator
         }
     End Function
 
-    Public Shared Function CreateBaseControl(ctrl As Control, row As DataRow) As Control
+    Public Shared Function CreateBaseControl(ctrl As Control, row As DataRow, designMode As Boolean) As Control
         Dim props As ControlDBProps = TransformDataRow(row)
 
         ctrl.Tag = props.Guid
@@ -66,6 +67,10 @@ Public Class ClassControlCreator
         ctrl.Font = props.Font
         ctrl.ForeColor = props.Color
 
+        If designMode Then
+            ctrl.Cursor = Cursors.Hand
+        End If
+
         Return ctrl
     End Function
 
@@ -155,6 +160,7 @@ Public Class ClassControlCreator
             .Name = $"{PREFIX_TABLE}_{clsTools.ShortGUID}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
             .Cursor = Cursors.Hand,
+            .Location = location,
             .AllowUserToAddRows = False,
             .AllowUserToDeleteRows = False,
             .AllowUserToResizeColumns = False,
@@ -174,13 +180,22 @@ Public Class ClassControlCreator
         Return control
     End Function
 
+    Public Shared Function CreateNewLine(location As Point) As LineLabel
+        Dim control As New LineLabel With {
+            .Name = $"{PREFIX_LINE}_{clsTools.ShortGUID}",
+            .Text = "---------------------------------",
+            .Location = location
+        }
+
+        Return control
+    End Function
+
     ' ----------------------- EXISITING CONTROLS -----------------------
 
     Public Shared Function CreateExistingTextbox(row As DataRow, designMode As Boolean) As TextBox
-        Dim control As TextBox = CreateBaseControl(New TextBox(), row)
+        Dim control As TextBox = CreateBaseControl(New TextBox(), row, designMode)
 
         control.BackColor = Color.White
-        control.Cursor = Cursors.Hand
 
         If row.Item("HEIGHT") > 27 Then
             control.Multiline = True
@@ -202,19 +217,17 @@ Public Class ClassControlCreator
     End Function
 
     Public Shared Function CreateExistingLabel(row As DataRow, designMode As Boolean) As Label
-        Dim control As Label = CreateBaseControl(New Label(), row)
+        Dim control As Label = CreateBaseControl(New Label(), row, designMode)
 
         control.Text = row.Item("CTRL_TEXT")
         control.AutoSize = True
-        control.Cursor = Cursors.Hand
 
         Return control
     End Function
 
     Public Shared Function CreateExistingCombobox(row As DataRow, designMode As Boolean) As ComboBox
-        Dim control As ComboBox = CreateBaseControl(New ComboBox(), row)
+        Dim control As ComboBox = CreateBaseControl(New ComboBox(), row, designMode)
 
-        control.Cursor = Cursors.Hand
         control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
 
         If Not designMode Then
@@ -230,9 +243,8 @@ Public Class ClassControlCreator
     End Function
 
     Public Shared Function CreateExistingDatepicker(row As DataRow, designMode As Boolean) As DateTimePicker
-        Dim control As DateTimePicker = CreateBaseControl(New DateTimePicker(), row)
+        Dim control As DateTimePicker = CreateBaseControl(New DateTimePicker(), row, designMode)
 
-        control.Cursor = Cursors.Hand
         control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
         control.Format = DateTimePickerFormat.Short
 
@@ -245,20 +257,18 @@ Public Class ClassControlCreator
     End Function
 
     Public Shared Function CreateExisingCheckbox(row As DataRow, designMode As Boolean) As CheckBox
-        Dim control As CheckBox = CreateBaseControl(New CheckBox(), row)
+        Dim control As CheckBox = CreateBaseControl(New CheckBox(), row, designMode)
 
         control.AutoSize = True
         control.Text = row.Item("CTRL_TEXT")
-        control.Cursor = Cursors.Hand
 
         Return control
     End Function
 
     Public Shared Function CreateExistingDataGridView(row As DataRow, designMode As Boolean) As DataGridView
-        Dim control As DataGridView = CreateBaseControl(New DataGridView(), row)
+        Dim control As DataGridView = CreateBaseControl(New DataGridView(), row, designMode)
 
         control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
-        control.Cursor = Cursors.Hand
         control.AllowUserToAddRows = False
         control.AllowUserToDeleteRows = False
         control.AllowUserToResizeColumns = False
@@ -275,10 +285,9 @@ Public Class ClassControlCreator
     End Function
 
     Public Shared Function CreateExistingTable(row As DataRow, columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow), designMode As Boolean) As DataGridView
-        Dim control As DataGridView = CreateBaseControl(New DataGridView(), row)
+        Dim control As DataGridView = CreateBaseControl(New DataGridView(), row, designMode)
 
         control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
-        control.Cursor = Cursors.Hand
         control.AllowUserToAddRows = False
         control.AllowUserToDeleteRows = False
         control.AllowUserToResizeColumns = False
@@ -297,4 +306,31 @@ Public Class ClassControlCreator
         Return control
     End Function
 
+    Public Shared Function CreateExistingLine(row As DataRow, designMode As Boolean) As LineLabel
+        Dim control As LineLabel = CreateBaseControl(New LineLabel(), row, designMode)
+        control.Text = "------------------------------"
+        control.BorderStyle = BorderStyle.None
+        control.AutoSize = False
+        control.BackColor = IntToColor(NotNull(row.Item("FONT_COLOR"), DEFAULT_COLOR))
+        control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
+
+        Return control
+    End Function
+
+
+    ' ----------------------- CUSTOM LABEL/LINE CLASS ----------------------- 
+
+    Public Class LineLabel
+        Inherits Label
+
+        Protected Overrides Sub OnPaint(e As PaintEventArgs)
+            'MyBase.OnPaint(e)
+
+            Dim size As New Size(e.ClipRectangle.Width, 2)
+            Dim rect As New Rectangle(New Point(0, 0), size)
+
+            'ControlPaint.DrawBorder(e.Graphics, rect, Me.ForeColor, ButtonBorderStyle.Solid)
+            e.Graphics.DrawLine(New Pen(ForeColor, 100), New Point(0, 0), New Point(e.ClipRectangle.Width, 2))
+        End Sub
+    End Class
 End Class
diff --git a/app/DD_PM_WINDREAM/ModuleControlProperties.vb b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
index 927efe9..61f51b2 100644
--- a/app/DD_PM_WINDREAM/ModuleControlProperties.vb
+++ b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
@@ -77,13 +77,21 @@ Public Module ModuleControlProperties
                 Return _size
             End Get
             Set(value As Size)
+                If (value.Height <= 0) Then
+                    value.Height = 1
+                End If
+
+                If (value.Width <= 20) Then
+                    value.Width = 20
+                End If
+
                 _size = value
             End Set
         End Property
 
         <Category("Anzeige")>
         <TypeConverter(GetType(FontConverter))>
-        Public Property Font As Font
+        Public Overridable Property Font As Font
             Get
                 Return _font
             End Get
@@ -350,4 +358,17 @@ Public Module ModuleControlProperties
     Public Class GridViewProperties
         Inherits InputProperties
     End Class
+
+    Public Class LineLabelProperties
+        Inherits BaseProperties
+
+        <Browsable(False)>
+        Public Overrides Property Font As Font
+            Get
+                Return Nothing
+            End Get
+            Set(value As Font)
+            End Set
+        End Property
+    End Class
 End Module
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
index 4b16540..f62360b 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmFormDesigner
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,15 +20,12 @@ Partial Class frmFormDesigner
     'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
     'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
     'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim CHANGED_WHOLabel As System.Windows.Forms.Label
-        Dim CHANGED_WHENLabel As System.Windows.Forms.Label
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFormDesigner))
-        Me.Panel1 = New System.Windows.Forms.Panel()
-        Me.lblDesign = New System.Windows.Forms.Label()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
+        Me.btnLine = New System.Windows.Forms.Button()
         Me.btnTabelle = New System.Windows.Forms.Button()
         Me.btnCheckbox = New System.Windows.Forms.Button()
         Me.btnVektor = New System.Windows.Forms.Button()
@@ -39,7 +36,6 @@ Partial Class frmFormDesigner
         Me.pnldesigner = New System.Windows.Forms.Panel()
         Me.Label1 = New System.Windows.Forms.Label()
         Me.lblhintergrund = New System.Windows.Forms.Label()
-        Me.gbxControl = New System.Windows.Forms.GroupBox()
         Me.TabControlEigenschaften = New System.Windows.Forms.TabControl()
         Me.pageProperties = New System.Windows.Forms.TabPage()
         Me.pgControls = New System.Windows.Forms.PropertyGrid()
@@ -50,40 +46,12 @@ Partial Class frmFormDesigner
         Me.Label2 = New System.Windows.Forms.Label()
         Me.btnwidth_minus = New System.Windows.Forms.Button()
         Me.btnwidth_plus = New System.Windows.Forms.Button()
-        Me.pageSQL = New System.Windows.Forms.TabPage()
-        Me.pnlAuswahlliste = New System.Windows.Forms.Panel()
-        Me.btnEditor = New System.Windows.Forms.Button()
-        Me.btnShowConnections = New System.Windows.Forms.Button()
-        Me.SQL_CommandTextBox = New System.Windows.Forms.TextBox()
         Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.cmbConnection = New System.Windows.Forms.ComboBox()
         Me.TBPM_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.pagePropertiesOld = New System.Windows.Forms.TabPage()
-        Me.LOAD_IDX_VALUECheckBox = New System.Windows.Forms.CheckBox()
-        Me.READ_ONLYCheckBox = New System.Windows.Forms.CheckBox()
-        Me.INDEX_NAME_VALUE = New System.Windows.Forms.TextBox()
-        Me.rbVektor = New System.Windows.Forms.RadioButton()
-        Me.rbIndex = New System.Windows.Forms.RadioButton()
-        Me.lblCtrlName = New System.Windows.Forms.Label()
-        Me.CHOICE_LISTTextBox = New System.Windows.Forms.TextBox()
-        Me.lblBeschriftung = New System.Windows.Forms.Label()
-        Me.VALIDATIONCheckBox = New System.Windows.Forms.CheckBox()
-        Me.lblIndex = New System.Windows.Forms.Label()
-        Me.CTRL_TEXTTextBox = New System.Windows.Forms.TextBox()
-        Me.cmbIndex = New System.Windows.Forms.ComboBox()
-        Me.NAMETextBox = New System.Windows.Forms.TextBox()
-        Me.CheckBoxAuswahlliste = New System.Windows.Forms.CheckBox()
-        Me.lblAuswahlliste = New System.Windows.Forms.Label()
-        Me.INDEX_NAMETextBox = New System.Windows.Forms.TextBox()
         Me.btndelete = New System.Windows.Forms.Button()
-        Me.btnsave = New System.Windows.Forms.Button()
-        Me.CHANGED_WHOTextBox = New System.Windows.Forms.TextBox()
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
         Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel()
-        Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox()
         Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
         Me.btnrefresh = New System.Windows.Forms.Button()
         Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter()
@@ -93,70 +61,24 @@ Partial Class frmFormDesigner
         Me.TBWH_CHECK_PROFILE_CONTROLSTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter()
         Me.TBPM_CONTROL_TABLEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TBPM_CONTROL_TABLETableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter()
-        CHANGED_WHOLabel = New System.Windows.Forms.Label()
-        CHANGED_WHENLabel = New System.Windows.Forms.Label()
-        Me.Panel1.SuspendLayout()
         Me.GroupBox1.SuspendLayout()
         Me.pnldesigner.SuspendLayout()
-        Me.gbxControl.SuspendLayout()
         Me.TabControlEigenschaften.SuspendLayout()
         Me.pageProperties.SuspendLayout()
         Me.pageFormat.SuspendLayout()
-        Me.pageSQL.SuspendLayout()
-        Me.pnlAuswahlliste.SuspendLayout()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.pagePropertiesOld.SuspendLayout()
         Me.StatusStrip1.SuspendLayout()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
-        'CHANGED_WHOLabel
-        '
-        CHANGED_WHOLabel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        CHANGED_WHOLabel.AutoSize = True
-        CHANGED_WHOLabel.Location = New System.Drawing.Point(12, 499)
-        CHANGED_WHOLabel.Name = "CHANGED_WHOLabel"
-        CHANGED_WHOLabel.Size = New System.Drawing.Size(91, 16)
-        CHANGED_WHOLabel.TabIndex = 18
-        CHANGED_WHOLabel.Text = "Changed who:"
-        '
-        'CHANGED_WHENLabel
-        '
-        CHANGED_WHENLabel.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        CHANGED_WHENLabel.AutoSize = True
-        CHANGED_WHENLabel.Location = New System.Drawing.Point(250, 499)
-        CHANGED_WHENLabel.Name = "CHANGED_WHENLabel"
-        CHANGED_WHENLabel.Size = New System.Drawing.Size(98, 16)
-        CHANGED_WHENLabel.TabIndex = 20
-        CHANGED_WHENLabel.Text = "Changed when:"
-        '
-        'Panel1
-        '
-        Me.Panel1.Controls.Add(Me.lblDesign)
-        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.Panel1.Location = New System.Drawing.Point(0, 0)
-        Me.Panel1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(995, 34)
-        Me.Panel1.TabIndex = 1
-        '
-        'lblDesign
-        '
-        Me.lblDesign.AutoSize = True
-        Me.lblDesign.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblDesign.Location = New System.Drawing.Point(12, 9)
-        Me.lblDesign.Name = "lblDesign"
-        Me.lblDesign.Size = New System.Drawing.Size(50, 16)
-        Me.lblDesign.TabIndex = 0
-        Me.lblDesign.Text = "Label2"
-        '
         'GroupBox1
         '
         Me.GroupBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.GroupBox1.Controls.Add(Me.btnLine)
         Me.GroupBox1.Controls.Add(Me.btnTabelle)
         Me.GroupBox1.Controls.Add(Me.btnCheckbox)
         Me.GroupBox1.Controls.Add(Me.btnVektor)
@@ -164,14 +86,27 @@ Partial Class frmFormDesigner
         Me.GroupBox1.Controls.Add(Me.btncmb)
         Me.GroupBox1.Controls.Add(Me.btntextbox)
         Me.GroupBox1.Controls.Add(Me.btnlabel)
-        Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox1.Location = New System.Drawing.Point(507, 70)
+        Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.GroupBox1.Location = New System.Drawing.Point(507, 12)
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.Size = New System.Drawing.Size(476, 129)
         Me.GroupBox1.TabIndex = 2
         Me.GroupBox1.TabStop = False
         Me.GroupBox1.Text = "Control-Typ (Drag and Drop)"
         '
+        'btnLine
+        '
+        Me.btnLine.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.btnLine.Image = CType(resources.GetObject("btnLine.Image"), System.Drawing.Image)
+        Me.btnLine.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnLine.Location = New System.Drawing.Point(290, 90)
+        Me.btnLine.Name = "btnLine"
+        Me.btnLine.Size = New System.Drawing.Size(133, 27)
+        Me.btnLine.TabIndex = 7
+        Me.btnLine.Text = "Linie"
+        Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.btnLine.UseVisualStyleBackColor = True
+        '
         'btnTabelle
         '
         Me.btnTabelle.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -179,7 +114,7 @@ Partial Class frmFormDesigner
         Me.btnTabelle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnTabelle.Location = New System.Drawing.Point(290, 55)
         Me.btnTabelle.Name = "btnTabelle"
-        Me.btnTabelle.Size = New System.Drawing.Size(103, 29)
+        Me.btnTabelle.Size = New System.Drawing.Size(133, 27)
         Me.btnTabelle.TabIndex = 6
         Me.btnTabelle.Text = "Tabelle"
         Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -192,7 +127,7 @@ Partial Class frmFormDesigner
         Me.btnCheckbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnCheckbox.Location = New System.Drawing.Point(151, 90)
         Me.btnCheckbox.Name = "btnCheckbox"
-        Me.btnCheckbox.Size = New System.Drawing.Size(133, 31)
+        Me.btnCheckbox.Size = New System.Drawing.Size(133, 27)
         Me.btnCheckbox.TabIndex = 5
         Me.btnCheckbox.Text = "Checkbox"
         Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -205,7 +140,7 @@ Partial Class frmFormDesigner
         Me.btnVektor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnVektor.Location = New System.Drawing.Point(151, 55)
         Me.btnVektor.Name = "btnVektor"
-        Me.btnVektor.Size = New System.Drawing.Size(133, 29)
+        Me.btnVektor.Size = New System.Drawing.Size(133, 27)
         Me.btnVektor.TabIndex = 4
         Me.btnVektor.Text = "Mehrfach-/Vektorfeld"
         Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -231,7 +166,7 @@ Partial Class frmFormDesigner
         Me.btncmb.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btncmb.Location = New System.Drawing.Point(12, 90)
         Me.btncmb.Name = "btncmb"
-        Me.btncmb.Size = New System.Drawing.Size(133, 31)
+        Me.btncmb.Size = New System.Drawing.Size(133, 27)
         Me.btncmb.TabIndex = 2
         Me.btncmb.Text = "Combobox"
         Me.btncmb.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -244,7 +179,7 @@ Partial Class frmFormDesigner
         Me.btntextbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btntextbox.Location = New System.Drawing.Point(13, 55)
         Me.btntextbox.Name = "btntextbox"
-        Me.btntextbox.Size = New System.Drawing.Size(133, 29)
+        Me.btntextbox.Size = New System.Drawing.Size(133, 27)
         Me.btntextbox.TabIndex = 1
         Me.btntextbox.Text = "Textbox"
         Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -272,9 +207,9 @@ Partial Class frmFormDesigner
         Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
         Me.pnldesigner.Controls.Add(Me.Label1)
         Me.pnldesigner.Controls.Add(Me.lblhintergrund)
-        Me.pnldesigner.Location = New System.Drawing.Point(15, 72)
+        Me.pnldesigner.Location = New System.Drawing.Point(15, 12)
         Me.pnldesigner.Name = "pnldesigner"
-        Me.pnldesigner.Size = New System.Drawing.Size(481, 337)
+        Me.pnldesigner.Size = New System.Drawing.Size(481, 525)
         Me.pnldesigner.TabIndex = 3
         '
         'Label1
@@ -298,22 +233,6 @@ Partial Class frmFormDesigner
         Me.lblhintergrund.TabIndex = 1
         Me.lblhintergrund.Text = "Validierungsbereich"
         '
-        'gbxControl
-        '
-        Me.gbxControl.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.gbxControl.Controls.Add(Me.TabControlEigenschaften)
-        Me.gbxControl.Controls.Add(Me.btndelete)
-        Me.gbxControl.Controls.Add(Me.btnsave)
-        Me.gbxControl.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.gbxControl.Location = New System.Drawing.Point(507, 205)
-        Me.gbxControl.Name = "gbxControl"
-        Me.gbxControl.Size = New System.Drawing.Size(476, 332)
-        Me.gbxControl.TabIndex = 4
-        Me.gbxControl.TabStop = False
-        Me.gbxControl.Text = "Controleigenschaften:"
-        '
         'TabControlEigenschaften
         '
         Me.TabControlEigenschaften.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
@@ -321,13 +240,11 @@ Partial Class frmFormDesigner
             Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.TabControlEigenschaften.Controls.Add(Me.pageProperties)
         Me.TabControlEigenschaften.Controls.Add(Me.pageFormat)
-        Me.TabControlEigenschaften.Controls.Add(Me.pageSQL)
-        Me.TabControlEigenschaften.Controls.Add(Me.pagePropertiesOld)
         Me.TabControlEigenschaften.Enabled = False
-        Me.TabControlEigenschaften.Location = New System.Drawing.Point(12, 22)
+        Me.TabControlEigenschaften.Location = New System.Drawing.Point(507, 147)
         Me.TabControlEigenschaften.Name = "TabControlEigenschaften"
         Me.TabControlEigenschaften.SelectedIndex = 0
-        Me.TabControlEigenschaften.Size = New System.Drawing.Size(455, 263)
+        Me.TabControlEigenschaften.Size = New System.Drawing.Size(476, 361)
         Me.TabControlEigenschaften.TabIndex = 22
         '
         'pageProperties
@@ -336,7 +253,7 @@ Partial Class frmFormDesigner
         Me.pageProperties.Location = New System.Drawing.Point(4, 25)
         Me.pageProperties.Name = "pageProperties"
         Me.pageProperties.Padding = New System.Windows.Forms.Padding(3)
-        Me.pageProperties.Size = New System.Drawing.Size(447, 234)
+        Me.pageProperties.Size = New System.Drawing.Size(468, 332)
         Me.pageProperties.TabIndex = 3
         Me.pageProperties.Text = "Eigenschaften"
         Me.pageProperties.UseVisualStyleBackColor = True
@@ -347,7 +264,7 @@ Partial Class frmFormDesigner
         Me.pgControls.HelpVisible = False
         Me.pgControls.Location = New System.Drawing.Point(3, 3)
         Me.pgControls.Name = "pgControls"
-        Me.pgControls.Size = New System.Drawing.Size(441, 228)
+        Me.pgControls.Size = New System.Drawing.Size(462, 326)
         Me.pgControls.TabIndex = 0
         '
         'pageFormat
@@ -362,7 +279,7 @@ Partial Class frmFormDesigner
         Me.pageFormat.Location = New System.Drawing.Point(4, 25)
         Me.pageFormat.Name = "pageFormat"
         Me.pageFormat.Padding = New System.Windows.Forms.Padding(3)
-        Me.pageFormat.Size = New System.Drawing.Size(447, 234)
+        Me.pageFormat.Size = New System.Drawing.Size(468, 332)
         Me.pageFormat.TabIndex = 1
         Me.pageFormat.Text = "Format"
         Me.pageFormat.UseVisualStyleBackColor = True
@@ -437,72 +354,6 @@ Partial Class frmFormDesigner
         Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnwidth_plus.UseVisualStyleBackColor = True
         '
-        'pageSQL
-        '
-        Me.pageSQL.Controls.Add(Me.pnlAuswahlliste)
-        Me.pageSQL.Location = New System.Drawing.Point(4, 25)
-        Me.pageSQL.Name = "pageSQL"
-        Me.pageSQL.Padding = New System.Windows.Forms.Padding(3)
-        Me.pageSQL.Size = New System.Drawing.Size(447, 234)
-        Me.pageSQL.TabIndex = 2
-        Me.pageSQL.Text = "SQL-Liste"
-        Me.pageSQL.UseVisualStyleBackColor = True
-        '
-        'pnlAuswahlliste
-        '
-        Me.pnlAuswahlliste.AutoScroll = True
-        Me.pnlAuswahlliste.Controls.Add(Me.btnEditor)
-        Me.pnlAuswahlliste.Controls.Add(Me.btnShowConnections)
-        Me.pnlAuswahlliste.Controls.Add(Me.SQL_CommandTextBox)
-        Me.pnlAuswahlliste.Controls.Add(Me.Label5)
-        Me.pnlAuswahlliste.Controls.Add(Me.Label4)
-        Me.pnlAuswahlliste.Controls.Add(Me.cmbConnection)
-        Me.pnlAuswahlliste.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.pnlAuswahlliste.Location = New System.Drawing.Point(3, 3)
-        Me.pnlAuswahlliste.Name = "pnlAuswahlliste"
-        Me.pnlAuswahlliste.Size = New System.Drawing.Size(441, 228)
-        Me.pnlAuswahlliste.TabIndex = 2
-        '
-        'btnEditor
-        '
-        Me.btnEditor.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.btnEditor.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnEditor.Image = CType(resources.GetObject("btnEditor.Image"), System.Drawing.Image)
-        Me.btnEditor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnEditor.Location = New System.Drawing.Point(6, 197)
-        Me.btnEditor.Name = "btnEditor"
-        Me.btnEditor.Size = New System.Drawing.Size(114, 28)
-        Me.btnEditor.TabIndex = 81
-        Me.btnEditor.Text = "Editor Detail"
-        Me.btnEditor.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnEditor.UseVisualStyleBackColor = True
-        '
-        'btnShowConnections
-        '
-        Me.btnShowConnections.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.btnShowConnections.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.database_go1
-        Me.btnShowConnections.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnShowConnections.Location = New System.Drawing.Point(271, 30)
-        Me.btnShowConnections.Name = "btnShowConnections"
-        Me.btnShowConnections.Size = New System.Drawing.Size(111, 24)
-        Me.btnShowConnections.TabIndex = 6
-        Me.btnShowConnections.Text = "Connections"
-        Me.btnShowConnections.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnShowConnections.UseVisualStyleBackColor = True
-        '
-        'SQL_CommandTextBox
-        '
-        Me.SQL_CommandTextBox.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
-            Or System.Windows.Forms.AnchorStyles.Left) _
-            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.SQL_CommandTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "SQL_UEBERPRUEFUNG", True))
-        Me.SQL_CommandTextBox.Font = New System.Drawing.Font("Courier New", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.SQL_CommandTextBox.Location = New System.Drawing.Point(5, 76)
-        Me.SQL_CommandTextBox.Multiline = True
-        Me.SQL_CommandTextBox.Name = "SQL_CommandTextBox"
-        Me.SQL_CommandTextBox.Size = New System.Drawing.Size(433, 115)
-        Me.SQL_CommandTextBox.TabIndex = 5
-        '
         'TBPM_PROFILE_CONTROLSBindingSource
         '
         Me.TBPM_PROFILE_CONTROLSBindingSource.DataMember = "TBPM_PROFILE_CONTROLS"
@@ -513,266 +364,17 @@ Partial Class frmFormDesigner
         Me.DD_DMSLiteDataSet.DataSetName = "DD_DMSLiteDataSet"
         Me.DD_DMSLiteDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
         '
-        'Label5
-        '
-        Me.Label5.AutoSize = True
-        Me.Label5.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label5.Location = New System.Drawing.Point(3, 57)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(76, 16)
-        Me.Label5.TabIndex = 2
-        Me.Label5.Text = "SQL-Befehl:"
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label4.Location = New System.Drawing.Point(3, 11)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(76, 16)
-        Me.Label4.TabIndex = 1
-        Me.Label4.Text = "Connection:"
-        '
-        'cmbConnection
-        '
-        Me.cmbConnection.DataBindings.Add(New System.Windows.Forms.Binding("SelectedValue", Me.TBPM_PROFILE_CONTROLSBindingSource, "CONNECTION_ID", True))
-        Me.cmbConnection.DataSource = Me.TBPM_CONNECTIONBindingSource
-        Me.cmbConnection.DisplayMember = "BEZEICHNUNG"
-        Me.cmbConnection.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbConnection.FormattingEnabled = True
-        Me.cmbConnection.Location = New System.Drawing.Point(5, 30)
-        Me.cmbConnection.Name = "cmbConnection"
-        Me.cmbConnection.Size = New System.Drawing.Size(260, 24)
-        Me.cmbConnection.TabIndex = 0
-        Me.cmbConnection.ValueMember = "GUID"
-        '
         'TBPM_CONNECTIONBindingSource
         '
         Me.TBPM_CONNECTIONBindingSource.DataMember = "TBPM_CONNECTION"
         Me.TBPM_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet
         '
-        'pagePropertiesOld
-        '
-        Me.pagePropertiesOld.AutoScroll = True
-        Me.pagePropertiesOld.BackColor = System.Drawing.Color.White
-        Me.pagePropertiesOld.Controls.Add(Me.LOAD_IDX_VALUECheckBox)
-        Me.pagePropertiesOld.Controls.Add(Me.READ_ONLYCheckBox)
-        Me.pagePropertiesOld.Controls.Add(Me.INDEX_NAME_VALUE)
-        Me.pagePropertiesOld.Controls.Add(Me.rbVektor)
-        Me.pagePropertiesOld.Controls.Add(Me.rbIndex)
-        Me.pagePropertiesOld.Controls.Add(Me.lblCtrlName)
-        Me.pagePropertiesOld.Controls.Add(Me.CHOICE_LISTTextBox)
-        Me.pagePropertiesOld.Controls.Add(Me.lblBeschriftung)
-        Me.pagePropertiesOld.Controls.Add(Me.VALIDATIONCheckBox)
-        Me.pagePropertiesOld.Controls.Add(Me.lblIndex)
-        Me.pagePropertiesOld.Controls.Add(Me.CTRL_TEXTTextBox)
-        Me.pagePropertiesOld.Controls.Add(Me.cmbIndex)
-        Me.pagePropertiesOld.Controls.Add(Me.NAMETextBox)
-        Me.pagePropertiesOld.Controls.Add(Me.CheckBoxAuswahlliste)
-        Me.pagePropertiesOld.Controls.Add(Me.lblAuswahlliste)
-        Me.pagePropertiesOld.Controls.Add(Me.INDEX_NAMETextBox)
-        Me.pagePropertiesOld.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.pagePropertiesOld.Location = New System.Drawing.Point(4, 25)
-        Me.pagePropertiesOld.Name = "pagePropertiesOld"
-        Me.pagePropertiesOld.Padding = New System.Windows.Forms.Padding(3)
-        Me.pagePropertiesOld.Size = New System.Drawing.Size(447, 234)
-        Me.pagePropertiesOld.TabIndex = 0
-        Me.pagePropertiesOld.Text = "Allgemein (Alt)"
-        '
-        'LOAD_IDX_VALUECheckBox
-        '
-        Me.LOAD_IDX_VALUECheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "LOAD_IDX_VALUE", True))
-        Me.LOAD_IDX_VALUECheckBox.Enabled = False
-        Me.LOAD_IDX_VALUECheckBox.Location = New System.Drawing.Point(6, 185)
-        Me.LOAD_IDX_VALUECheckBox.Name = "LOAD_IDX_VALUECheckBox"
-        Me.LOAD_IDX_VALUECheckBox.Size = New System.Drawing.Size(121, 24)
-        Me.LOAD_IDX_VALUECheckBox.TabIndex = 19
-        Me.LOAD_IDX_VALUECheckBox.Text = "Lade Indexdaten"
-        Me.ToolTip1.SetToolTip(Me.LOAD_IDX_VALUECheckBox, "Die im zugrundeliegenden Index gepeicherten" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Daten werden nicht angezeigt")
-        Me.LOAD_IDX_VALUECheckBox.UseVisualStyleBackColor = True
-        '
-        'READ_ONLYCheckBox
-        '
-        Me.READ_ONLYCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "READ_ONLY", True))
-        Me.READ_ONLYCheckBox.Enabled = False
-        Me.READ_ONLYCheckBox.Location = New System.Drawing.Point(6, 164)
-        Me.READ_ONLYCheckBox.Name = "READ_ONLYCheckBox"
-        Me.READ_ONLYCheckBox.Size = New System.Drawing.Size(86, 24)
-        Me.READ_ONLYCheckBox.TabIndex = 18
-        Me.READ_ONLYCheckBox.Text = "Read Only"
-        Me.ToolTip1.SetToolTip(Me.READ_ONLYCheckBox, "lässt keine Änderungen am Index zu")
-        Me.READ_ONLYCheckBox.UseVisualStyleBackColor = True
-        '
-        'INDEX_NAME_VALUE
-        '
-        Me.INDEX_NAME_VALUE.BackColor = System.Drawing.Color.White
-        Me.INDEX_NAME_VALUE.BorderStyle = System.Windows.Forms.BorderStyle.None
-        Me.INDEX_NAME_VALUE.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
-        Me.INDEX_NAME_VALUE.Enabled = False
-        Me.INDEX_NAME_VALUE.ForeColor = System.Drawing.Color.White
-        Me.INDEX_NAME_VALUE.Location = New System.Drawing.Point(334, 142)
-        Me.INDEX_NAME_VALUE.Name = "INDEX_NAME_VALUE"
-        Me.INDEX_NAME_VALUE.ReadOnly = True
-        Me.INDEX_NAME_VALUE.Size = New System.Drawing.Size(51, 16)
-        Me.INDEX_NAME_VALUE.TabIndex = 17
-        Me.INDEX_NAME_VALUE.TabStop = False
-        '
-        'rbVektor
-        '
-        Me.rbVektor.AutoSize = True
-        Me.rbVektor.Enabled = False
-        Me.rbVektor.Location = New System.Drawing.Point(174, 52)
-        Me.rbVektor.Name = "rbVektor"
-        Me.rbVektor.Size = New System.Drawing.Size(225, 20)
-        Me.rbVektor.TabIndex = 15
-        Me.rbVektor.TabStop = True
-        Me.rbVektor.Text = "Benutze Vektor-Feld für Metadaten"
-        Me.rbVektor.UseVisualStyleBackColor = True
-        Me.rbVektor.Visible = False
-        '
-        'rbIndex
-        '
-        Me.rbIndex.AutoSize = True
-        Me.rbIndex.Enabled = False
-        Me.rbIndex.Location = New System.Drawing.Point(9, 52)
-        Me.rbIndex.Name = "rbIndex"
-        Me.rbIndex.Size = New System.Drawing.Size(159, 20)
-        Me.rbIndex.TabIndex = 14
-        Me.rbIndex.TabStop = True
-        Me.rbIndex.Text = "Beschreibe Index direkt"
-        Me.rbIndex.UseVisualStyleBackColor = True
-        Me.rbIndex.Visible = False
-        '
-        'lblCtrlName
-        '
-        Me.lblCtrlName.AutoSize = True
-        Me.lblCtrlName.Enabled = False
-        Me.lblCtrlName.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblCtrlName.Location = New System.Drawing.Point(6, 3)
-        Me.lblCtrlName.Name = "lblCtrlName"
-        Me.lblCtrlName.Size = New System.Drawing.Size(46, 16)
-        Me.lblCtrlName.TabIndex = 0
-        Me.lblCtrlName.Text = "Name:"
-        '
-        'CHOICE_LISTTextBox
-        '
-        Me.CHOICE_LISTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHOICE_LIST", True))
-        Me.CHOICE_LISTTextBox.Enabled = False
-        Me.CHOICE_LISTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CHOICE_LISTTextBox.Location = New System.Drawing.Point(174, 185)
-        Me.CHOICE_LISTTextBox.Name = "CHOICE_LISTTextBox"
-        Me.CHOICE_LISTTextBox.Size = New System.Drawing.Size(178, 23)
-        Me.CHOICE_LISTTextBox.TabIndex = 13
-        '
-        'lblBeschriftung
-        '
-        Me.lblBeschriftung.AutoSize = True
-        Me.lblBeschriftung.Enabled = False
-        Me.lblBeschriftung.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblBeschriftung.Location = New System.Drawing.Point(132, 4)
-        Me.lblBeschriftung.Name = "lblBeschriftung"
-        Me.lblBeschriftung.Size = New System.Drawing.Size(83, 16)
-        Me.lblBeschriftung.TabIndex = 2
-        Me.lblBeschriftung.Text = "Beschriftung:"
-        Me.lblBeschriftung.Visible = False
-        '
-        'VALIDATIONCheckBox
-        '
-        Me.VALIDATIONCheckBox.DataBindings.Add(New System.Windows.Forms.Binding("CheckState", Me.TBPM_PROFILE_CONTROLSBindingSource, "VALIDATION", True))
-        Me.VALIDATIONCheckBox.Enabled = False
-        Me.VALIDATIONCheckBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.VALIDATIONCheckBox.Location = New System.Drawing.Point(6, 143)
-        Me.VALIDATIONCheckBox.Name = "VALIDATIONCheckBox"
-        Me.VALIDATIONCheckBox.Size = New System.Drawing.Size(144, 24)
-        Me.VALIDATIONCheckBox.TabIndex = 12
-        Me.VALIDATIONCheckBox.Text = "Eingabe zwingend"
-        Me.VALIDATIONCheckBox.UseVisualStyleBackColor = True
-        '
-        'lblIndex
-        '
-        Me.lblIndex.AutoSize = True
-        Me.lblIndex.Enabled = False
-        Me.lblIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblIndex.Location = New System.Drawing.Point(3, 84)
-        Me.lblIndex.Name = "lblIndex"
-        Me.lblIndex.Size = New System.Drawing.Size(124, 16)
-        Me.lblIndex.TabIndex = 4
-        Me.lblIndex.Text = "zugeordneter Index:"
-        Me.lblIndex.Visible = False
-        '
-        'CTRL_TEXTTextBox
-        '
-        Me.CTRL_TEXTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CTRL_TEXT", True))
-        Me.CTRL_TEXTTextBox.Enabled = False
-        Me.CTRL_TEXTTextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CTRL_TEXTTextBox.Location = New System.Drawing.Point(135, 23)
-        Me.CTRL_TEXTTextBox.Multiline = True
-        Me.CTRL_TEXTTextBox.Name = "CTRL_TEXTTextBox"
-        Me.CTRL_TEXTTextBox.Size = New System.Drawing.Size(298, 23)
-        Me.CTRL_TEXTTextBox.TabIndex = 11
-        '
-        'cmbIndex
-        '
-        Me.cmbIndex.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "INDEX_NAME", True))
-        Me.cmbIndex.Enabled = False
-        Me.cmbIndex.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbIndex.FormattingEnabled = True
-        Me.cmbIndex.Location = New System.Drawing.Point(6, 103)
-        Me.cmbIndex.Name = "cmbIndex"
-        Me.cmbIndex.Size = New System.Drawing.Size(178, 24)
-        Me.cmbIndex.TabIndex = 5
-        Me.cmbIndex.Visible = False
-        '
-        'NAMETextBox
-        '
-        Me.NAMETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "NAME", True))
-        Me.NAMETextBox.Enabled = False
-        Me.NAMETextBox.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.NAMETextBox.Location = New System.Drawing.Point(9, 23)
-        Me.NAMETextBox.Name = "NAMETextBox"
-        Me.NAMETextBox.Size = New System.Drawing.Size(121, 23)
-        Me.NAMETextBox.TabIndex = 10
-        '
-        'CheckBoxAuswahlliste
-        '
-        Me.CheckBoxAuswahlliste.AutoSize = True
-        Me.CheckBoxAuswahlliste.Enabled = False
-        Me.CheckBoxAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.CheckBoxAuswahlliste.Location = New System.Drawing.Point(174, 145)
-        Me.CheckBoxAuswahlliste.Name = "CheckBoxAuswahlliste"
-        Me.CheckBoxAuswahlliste.Size = New System.Drawing.Size(98, 20)
-        Me.CheckBoxAuswahlliste.TabIndex = 6
-        Me.CheckBoxAuswahlliste.Text = "Auswahlliste"
-        Me.CheckBoxAuswahlliste.UseVisualStyleBackColor = True
-        Me.CheckBoxAuswahlliste.Visible = False
-        '
-        'lblAuswahlliste
-        '
-        Me.lblAuswahlliste.AutoSize = True
-        Me.lblAuswahlliste.Enabled = False
-        Me.lblAuswahlliste.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.lblAuswahlliste.Location = New System.Drawing.Point(171, 167)
-        Me.lblAuswahlliste.Name = "lblAuswahlliste"
-        Me.lblAuswahlliste.Size = New System.Drawing.Size(186, 16)
-        Me.lblAuswahlliste.TabIndex = 7
-        Me.lblAuswahlliste.Text = "Auswahllistennamen eingeben:"
-        Me.lblAuswahlliste.Visible = False
-        '
-        'INDEX_NAMETextBox
-        '
-        Me.INDEX_NAMETextBox.Enabled = False
-        Me.INDEX_NAMETextBox.Location = New System.Drawing.Point(6, 103)
-        Me.INDEX_NAMETextBox.Name = "INDEX_NAMETextBox"
-        Me.INDEX_NAMETextBox.Size = New System.Drawing.Size(319, 23)
-        Me.INDEX_NAMETextBox.TabIndex = 16
-        Me.INDEX_NAMETextBox.Visible = False
-        '
         'btndelete
         '
         Me.btndelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.btndelete.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12
         Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btndelete.Location = New System.Drawing.Point(13, 295)
+        Me.btndelete.Location = New System.Drawing.Point(507, 514)
         Me.btndelete.Name = "btndelete"
         Me.btndelete.Size = New System.Drawing.Size(178, 23)
         Me.btndelete.TabIndex = 1
@@ -780,29 +382,6 @@ Partial Class frmFormDesigner
         Me.btndelete.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btndelete.UseVisualStyleBackColor = True
         '
-        'btnsave
-        '
-        Me.btnsave.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnsave.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.save
-        Me.btnsave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnsave.Location = New System.Drawing.Point(279, 294)
-        Me.btnsave.Name = "btnsave"
-        Me.btnsave.Size = New System.Drawing.Size(188, 24)
-        Me.btnsave.TabIndex = 5
-        Me.btnsave.Text = "Änderungen Speichern"
-        Me.btnsave.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnsave.UseVisualStyleBackColor = True
-        Me.btnsave.Visible = False
-        '
-        'CHANGED_WHOTextBox
-        '
-        Me.CHANGED_WHOTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.CHANGED_WHOTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHO", True))
-        Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(15, 518)
-        Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
-        Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(222, 23)
-        Me.CHANGED_WHOTextBox.TabIndex = 19
-        '
         'StatusStrip1
         '
         Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen})
@@ -814,28 +393,19 @@ Partial Class frmFormDesigner
         '
         'tslblAenderungen
         '
-        Me.tslblAenderungen.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.flag_red
+        Me.tslblAenderungen.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.database_save
         Me.tslblAenderungen.Name = "tslblAenderungen"
-        Me.tslblAenderungen.Size = New System.Drawing.Size(153, 17)
-        Me.tslblAenderungen.Text = "Änderungen gespeichert"
-        Me.tslblAenderungen.Visible = False
-        '
-        'CHANGED_WHENTextBox
-        '
-        Me.CHANGED_WHENTextBox.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.CHANGED_WHENTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_PROFILE_CONTROLSBindingSource, "CHANGED_WHEN", True))
-        Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(253, 518)
-        Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
-        Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(159, 23)
-        Me.CHANGED_WHENTextBox.TabIndex = 21
+        Me.tslblAenderungen.Size = New System.Drawing.Size(152, 17)
+        Me.tslblAenderungen.Text = "Noch keine Änderungen"
         '
         'btnrefresh
         '
+        Me.btnrefresh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
         Me.btnrefresh.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.arrow_refresh
         Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnrefresh.Location = New System.Drawing.Point(415, 41)
+        Me.btnrefresh.Location = New System.Drawing.Point(828, 514)
         Me.btnrefresh.Name = "btnrefresh"
-        Me.btnrefresh.Size = New System.Drawing.Size(81, 23)
+        Me.btnrefresh.Size = New System.Drawing.Size(155, 23)
         Me.btnrefresh.TabIndex = 24
         Me.btnrefresh.Text = "Refresh"
         Me.btnrefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -889,13 +459,9 @@ Partial Class frmFormDesigner
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(995, 578)
         Me.Controls.Add(Me.btnrefresh)
-        Me.Controls.Add(CHANGED_WHENLabel)
-        Me.Controls.Add(Me.CHANGED_WHENTextBox)
         Me.Controls.Add(Me.StatusStrip1)
-        Me.Controls.Add(CHANGED_WHOLabel)
-        Me.Controls.Add(Me.CHANGED_WHOTextBox)
-        Me.Controls.Add(Me.gbxControl)
-        Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.btndelete)
+        Me.Controls.Add(Me.TabControlEigenschaften)
         Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.pnldesigner)
         Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
@@ -905,24 +471,16 @@ Partial Class frmFormDesigner
         Me.MinimizeBox = False
         Me.Name = "frmFormDesigner"
         Me.Text = "Validation-Designer"
-        Me.Panel1.ResumeLayout(False)
-        Me.Panel1.PerformLayout()
         Me.GroupBox1.ResumeLayout(False)
         Me.pnldesigner.ResumeLayout(False)
         Me.pnldesigner.PerformLayout()
-        Me.gbxControl.ResumeLayout(False)
         Me.TabControlEigenschaften.ResumeLayout(False)
         Me.pageProperties.ResumeLayout(False)
         Me.pageFormat.ResumeLayout(False)
         Me.pageFormat.PerformLayout()
-        Me.pageSQL.ResumeLayout(False)
-        Me.pnlAuswahlliste.ResumeLayout(False)
-        Me.pnlAuswahlliste.PerformLayout()
         CType(Me.TBPM_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_CONNECTIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.pagePropertiesOld.ResumeLayout(False)
-        Me.pagePropertiesOld.PerformLayout()
         Me.StatusStrip1.ResumeLayout(False)
         Me.StatusStrip1.PerformLayout()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
@@ -935,35 +493,18 @@ Partial Class frmFormDesigner
     Friend WithEvents TBPM_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPM_PROFILE_CONTROLSTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter
     Friend WithEvents TableAdapterManager As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager
-    Friend WithEvents Panel1 As System.Windows.Forms.Panel
-    Friend WithEvents lblDesign As System.Windows.Forms.Label
     Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
     Friend WithEvents btnlabel As System.Windows.Forms.Button
     Friend WithEvents btntextbox As System.Windows.Forms.Button
     Friend WithEvents pnldesigner As System.Windows.Forms.Panel
     Friend WithEvents btndtp As System.Windows.Forms.Button
     Friend WithEvents btncmb As System.Windows.Forms.Button
-    Friend WithEvents gbxControl As System.Windows.Forms.GroupBox
-    Friend WithEvents lblBeschriftung As System.Windows.Forms.Label
-    Friend WithEvents lblCtrlName As System.Windows.Forms.Label
     Friend WithEvents lblhintergrund As System.Windows.Forms.Label
-    Friend WithEvents lblIndex As System.Windows.Forms.Label
-    Friend WithEvents cmbIndex As System.Windows.Forms.ComboBox
-    Friend WithEvents btnsave As System.Windows.Forms.Button
-    Friend WithEvents lblAuswahlliste As System.Windows.Forms.Label
-    Friend WithEvents CheckBoxAuswahlliste As System.Windows.Forms.CheckBox
     Friend WithEvents btndelete As System.Windows.Forms.Button
     Friend WithEvents Label1 As System.Windows.Forms.Label
-    Friend WithEvents CHOICE_LISTTextBox As System.Windows.Forms.TextBox
-    Friend WithEvents VALIDATIONCheckBox As System.Windows.Forms.CheckBox
-    Friend WithEvents CTRL_TEXTTextBox As System.Windows.Forms.TextBox
-    Friend WithEvents NAMETextBox As System.Windows.Forms.TextBox
-    Friend WithEvents CHANGED_WHOTextBox As System.Windows.Forms.TextBox
     Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
     Friend WithEvents tslblAenderungen As System.Windows.Forms.ToolStripStatusLabel
-    Friend WithEvents CHANGED_WHENTextBox As System.Windows.Forms.TextBox
     Friend WithEvents TabControlEigenschaften As System.Windows.Forms.TabControl
-    Friend WithEvents pagePropertiesOld As System.Windows.Forms.TabPage
     Friend WithEvents pageFormat As System.Windows.Forms.TabPage
     Friend WithEvents btnwidth_minus As System.Windows.Forms.Button
     Friend WithEvents btnwidth_plus As System.Windows.Forms.Button
@@ -972,30 +513,17 @@ Partial Class frmFormDesigner
     Friend WithEvents Label3 As System.Windows.Forms.Label
     Friend WithEvents Label2 As System.Windows.Forms.Label
     Friend WithEvents btnVektor As System.Windows.Forms.Button
-    Friend WithEvents pageSQL As System.Windows.Forms.TabPage
     Friend WithEvents TBPM_CONNECTIONBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPM_CONNECTIONTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter
-    Friend WithEvents pnlAuswahlliste As System.Windows.Forms.Panel
-    Friend WithEvents Label4 As System.Windows.Forms.Label
-    Friend WithEvents cmbConnection As System.Windows.Forms.ComboBox
-    Friend WithEvents Label5 As System.Windows.Forms.Label
-    Friend WithEvents SQL_CommandTextBox As System.Windows.Forms.TextBox
     Friend WithEvents btnCheckbox As System.Windows.Forms.Button
-    Friend WithEvents rbVektor As System.Windows.Forms.RadioButton
-    Friend WithEvents rbIndex As System.Windows.Forms.RadioButton
-    Friend WithEvents INDEX_NAMETextBox As System.Windows.Forms.TextBox
-    Friend WithEvents INDEX_NAME_VALUE As System.Windows.Forms.TextBox
     Friend WithEvents TBWH_CHECK_PROFILE_CONTROLSBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBWH_CHECK_PROFILE_CONTROLSTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBWH_CHECK_PROFILE_CONTROLSTableAdapter
-    Friend WithEvents LOAD_IDX_VALUECheckBox As System.Windows.Forms.CheckBox
-    Friend WithEvents READ_ONLYCheckBox As System.Windows.Forms.CheckBox
     Friend WithEvents ToolTip1 As System.Windows.Forms.ToolTip
     Friend WithEvents btnTabelle As System.Windows.Forms.Button
     Friend WithEvents TBPM_CONTROL_TABLEBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter
     Friend WithEvents btnrefresh As System.Windows.Forms.Button
-    Friend WithEvents btnShowConnections As System.Windows.Forms.Button
-    Friend WithEvents btnEditor As Button
     Friend WithEvents pageProperties As TabPage
     Friend WithEvents pgControls As PropertyGrid
+    Friend WithEvents btnLine As Button
 End Class
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx
index 2d14d4f..a227075 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.resx
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx
@@ -117,29 +117,18 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <metadata name="CHANGED_WHOLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <metadata name="CHANGED_WHENLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnEditor.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnLine.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAANtJREFUOE+tkzsSgjAURbMEl+TQswDWg8M2LKSWggW4DrWhUBuKaAGUTw5DMASU
-        z5iZw0zeu/cmmRDljqqqtmVZJjW6Rhx0URR7NK38M7TWm7p5yrJMoiiSIAjE87we1OihQYuntStFIU1T
-        8X1f4kMsl/NVnvrVgxo9NGjxNGaS8jxvGvfbY2B0QcOOONZ/AhhMKM49wteAJTQBfKYYMwO9yZVnB7jn
-        BSOyTTaDgOSYdM1VAVxPGO66uREZg8sggCsihJ2sCnAxIttk6H7lXyuA3R99TAgW4Dxnpd6OS61yelZ6
-        QAAAAABJRU5ErkJggg==
+        iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        wwAADsMBx2+oZAAAABl0RVh0U29mdHdhcmUAcGFpbnQubmV0IDQuMC4xMzQDW3oAAAA0SURBVEhLYxgF
+        o2AUEAe8gDiICpgbiFHACyD+TwWsCMQoIA2IC6iA+YF4FIyCUTAAgIEBAJUPH6VVzyeQAAAAAElFTkSu
+        QmCC
 </value>
   </data>
   <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>179, 17</value>
   </metadata>
-  <metadata name="TBPM_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>179, 17</value>
-  </metadata>
   <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -149,12 +138,6 @@
   <metadata name="TBPM_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1021, 17</value>
   </metadata>
-  <metadata name="TBPM_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1021, 17</value>
-  </metadata>
-  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>898, 56</value>
-  </metadata>
   <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>904, 17</value>
   </metadata>
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index b9fa7b4..539bdd4 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -1,17 +1,12 @@
 Imports DD_LIB_Standards
 
 Public Class frmFormDesigner
-    Private COLUMN_GUID
-    Private MouseIsDown As Boolean = False
-    Private idxlbl As Integer = 0
-    Private idxtxt As Integer = 0
-    Private idxcmb As Integer = 0
-    Private idxdtp As Integer = 0
-    Private idxdgv As Integer = 0
-    Private idxchk As Integer = 0
-    Private _loading As Boolean = False
-    Dim frmTableColumn As New frmControl_Detail
-    Private CURRENT_CONTROL As Control
+    Public ProfileId As Integer
+    Public ProfileName As String
+    Public ProfileObjectType As String
+
+    ' Control Variables
+    Private CurrentControl As Control = Nothing
 
     ' Movement Variables
     Private Mouse_IsPressed As Boolean
@@ -22,42 +17,13 @@ Public Class frmFormDesigner
     ' Windream List Data
     Private Windream_ChoiceLists As List(Of String)
     Private Windream_Indicies As List(Of String)
+    Private Windream_VectorIndicies As List(Of String)
 
-    Private Sub frmFormDesigner_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
-        If CURRENT_ProfilGUID > 0 Then
-            Dim sql As String = $"SELECT NAME, INDEX_NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {CURRENT_ProfilGUID} AND CTRL_TYPE <> 'LBL'"
-            Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
-
-            Dim missingIndexControls As New List(Of String)
-
-            For Each row As DataRow In dt.Rows
-                If NotNull(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then
-                    missingIndexControls.Add(row.Item("NAME"))
-
-                End If
-            Next
-
-            If missingIndexControls.Count > 0 Then
-                e.Cancel = True
-                Dim missingControls As String = String.Join(vbCrLf, missingIndexControls.ToArray())
-                MsgBox($"Für die folgenden Controls wurden noch keine Indexdefinitionen hinterlegt: {vbCrLf}{vbCrLf}{missingControls}")
-            End If
-        End If
-
-        If Application.OpenForms().OfType(Of frmControl_Detail).Any Then
-            frmControl_Detail.Close()
-        End If
-
-    End Sub
 
-
-
-    Private Sub frmFormDesigner_Load(sender As Object, e As System.EventArgs) Handles Me.Load
+    Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
-            lblDesign.Text = "FormDesigner für Profil: " & CURRENT_ProfilName
-            'löscht alle Controls
-            pnldesigner.Controls.Clear()
-            CURRENT_CONTROL = Nothing
+            ' Profil Name in Fenstertitel setzen
+            Text = $"{Text} - Profil: {ProfileName}"
 
             Try
                 ' Windream initialisieren
@@ -66,6 +32,7 @@ Public Class frmFormDesigner
                 'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden
                 Windream_Indicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
                 Windream_ChoiceLists = clsWD_GET.GetChoiceLists()
+                Windream_VectorIndicies = Windream_Indicies.FindAll(AddressOf IsVectorIndex)
             Catch ex As Exception
                 MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
             End Try
@@ -80,124 +47,51 @@ Public Class frmFormDesigner
                 MsgBox("Fehler bei Laden der Connection-Strings und Grunddaten: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
             End Try
 
-            Load_indexe()
-            Controls_laden()
-        Catch ex As System.Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "error loading form:")
-        End Try
-    End Sub
-    Sub Load_indexe()
-        cmbIndex.Items.Clear()
-        Dim indexe = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
-        If indexe IsNot Nothing Then
-            cmbIndex.Items.Add("")
-            For Each index As String In indexe
-                cmbIndex.Items.Add(index)
-            Next
-            cmbIndex.Items.Add("DD PM-ONLY FOR DISPLAY")
-            cmbIndex.SelectedIndex = -1
-        End If
-    End Sub
-    Sub Load_Indexe_Vektor()
-        Try
-            Me.cmbIndex.Items.Clear()
-
-            Dim indexe = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE)
-            If indexe IsNot Nothing Then
-                Me.cmbIndex.Items.Add("")
-                For Each index As String In indexe
-                    Dim _vektorString As Boolean = False
-
-                    Select Case clsWD_GET.GetTypeOfIndexAsIntByName(index)
-                        Case 4107 'Vektor Zahl
-                            _vektorString = True
-                        Case 4097
-                            _vektorString = True
-                        Case Else
-                            _vektorString = False
-                    End Select
-                    If _vektorString = True Then
-                        Me.cmbIndex.Items.Add(index)
-                    End If
-
-                Next
-            End If
+            LoadControls()
         Catch ex As Exception
-            MsgBox("Fehler bei Indexe Volltext eintragen: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "error loading form:")
         End Try
     End Sub
-    Sub Load_Control(Optional ID As Integer = 0)
-        _loading = True
-        Try
-            TabControlEigenschaften.SelectedIndex = 0
-            cmbIndex.Visible = False
-            INDEX_NAMETextBox.Visible = False
-            If ID = 0 Then
-                If IsNothing(CURRENT_CONTROL.Tag) Then
-                    Dim ID_CTRL = GetControlGUID(CURRENT_CONTROL.Name)
-                    If ID_CTRL > 0 Then
-                        CURRENT_CONTROL.Tag = ID_CTRL
-                    End If
-                End If
-                CURRENT_CONTROL_ID = CURRENT_CONTROL.Tag
-            Else
-                CURRENT_CONTROL_ID = ID
-            End If
 
-            If CURRENT_CONTROL_ID <> 0 Then
-                gbxControl.Enabled = True
-                TBPM_PROFILE_CONTROLSTableAdapter.Fill(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_CONTROL_ID)
-                Dim dt As DataTable = DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS
-                Dim dr As DataRow = dt.Rows(0)
-                If dr Is Nothing = False Then
-                    ' MsgBox(dr.Item("INDEX_NAME").ToString)
-                    If dr.Item("INDEX_NAME").ToString.StartsWith("[%VKT") Then
-                        Me.rbVektor.Checked = True
-                        Me.rbIndex.Checked = False
-                        Me.INDEX_NAMETextBox.Visible = True
-                        Me.cmbIndex.Visible = False
-                        Me.INDEX_NAMETextBox.Text = dr.Item("INDEX_NAME").ToString.Replace("[%VKT", "")
-                    Else
-                        Me.rbIndex.Checked = True
-                        Me.rbVektor.Checked = False
-                        Me.INDEX_NAMETextBox.Visible = False
-                        Me.cmbIndex.Visible = True
-                        IDX_CMB(CURRENT_CONTROL.Name)
-                    End If
-                    Try
-                        If CheckBoxAuswahlliste.Visible = False Then
-                            _loading = False
-                            Exit Sub
-                        End If
-                        If dr.Item("CHOICE_LIST") <> "" Then
-                            CheckBoxAuswahlliste.Checked = True
-                            CHOICE_LISTTextBox.Text = dr.Item("CHOICE_LIST")
-                        End If
-                    Catch ex As Exception
-                        CheckBoxAuswahlliste.Checked = False
-                    End Try
+    Private Sub frmFormDesigner_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
+        If ProfileId > 0 Then
+            Dim sql As String = $"SELECT NAME, INDEX_NAME FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {ProfileId} AND CTRL_TYPE <> 'LBL' AND CTRL_TYPE <> 'LINE'"
+            Dim dt As DataTable = ClassDatabase.Return_Datatable(sql)
+
+            Dim missingIndexControls As New List(Of String)
 
+            For Each row As DataRow In dt.Rows
+                If NotNull(row.Item("INDEX_NAME"), String.Empty) = String.Empty Then
+                    missingIndexControls.Add(row.Item("NAME"))
                 End If
-            Else
-                gbxControl.Enabled = False
-                tslblAenderungen.Visible = True
-                tslblAenderungen.Text = "Konte das aktuelle Control nicht wählen!!"
-            End If
-            btnsave.Visible = True
-        Catch ex As Exception
-            If Not ex.Message.Contains("Data Reader") Then
-                MsgBox("Fehler bei Laden des Controls: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
+            Next
+
+            If missingIndexControls.Count > 0 Then
+                e.Cancel = True
+                Dim missingControls As String = String.Join(vbCrLf, missingIndexControls.ToArray())
+                MsgBox($"Für die folgenden Controls wurden noch keine Indexdefinitionen hinterlegt: {vbCrLf}{vbCrLf}{missingControls}")
             End If
+        End If
+
+        If Application.OpenForms().OfType(Of frmControl_Detail).Any Then
+            frmControl_Detail.Close()
+        End If
 
-        End Try
-        _loading = False
     End Sub
 
+    ''' <summary>
+    ''' Filtert aus der Liste von Indexen die Vektor Indexe heraus
+    ''' </summary>
+    Private Function IsVectorIndex(index As String) As Boolean
+        Dim type As Integer = clsWD_GET.GetTypeOfIndexAsIntByName(index)
 
+        'Vektor Zahl Oder Vektor String
+        Return (type = 4107 Or type = 4097)
+    End Function
 
-    Sub Controls_laden()
+    Sub LoadControls()
         Try
-            TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_ProfilGUID)
+            TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, ProfileId)
             TBPM_CONTROL_TABLETableAdapter.FillAll(DD_DMSLiteDataSet.TBPM_CONTROL_TABLE)
 
             ' löscht alle Controls
@@ -224,194 +118,201 @@ Public Class frmFormDesigner
                         pnldesigner.Controls.Add(txt)
                         SetMovementHandlers(txt)
 
-                        'Dim ctrl = CreateBaseControl(New TextBox, guid, name, x, y, font, color)
-                        'AddExistingTextbox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "LBL"
                         Dim lbl = ClassControlCreator.CreateExistingLabel(row, True)
                         pnldesigner.Controls.Add(lbl)
                         SetMovementHandlers(lbl)
 
-                        'Dim ctrl = CreateBaseControl(New Label, guid, name, x, y, font, color)
-                        'AddExistingLabel(ctrl, row.Item("CTRL_TEXT"))
+
                     Case "CMB"
                         Dim cmb = ClassControlCreator.CreateExistingCombobox(row, True)
                         pnldesigner.Controls.Add(cmb)
                         SetMovementHandlers(cmb)
 
-                        'Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
-                        'AddExistingCombobox(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "DTP"
                         Dim dtp = ClassControlCreator.CreateExistingDatepicker(row, True)
                         pnldesigner.Controls.Add(dtp)
                         SetMovementHandlers(dtp)
 
-                        'Dim ctrl = CreateBaseControl(New ComboBox, guid, name, x, y, font, color)
-                        'AddExistingDatetimepicker(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "CHK"
                         Dim chk = ClassControlCreator.CreateExisingCheckbox(row, True)
                         pnldesigner.Controls.Add(chk)
                         SetMovementHandlers(chk)
 
-                        'Dim ctrl = CreateBaseControl(New CheckBox, guid, name, x, y, font, color)
-                        'AddExistingCheckbox(ctrl, row.Item("CTRL_TEXT"), row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "DGV"
                         Dim dgv = ClassControlCreator.CreateExistingDataGridView(row, True)
                         pnldesigner.Controls.Add(dgv)
                         SetMovementHandlers(dgv)
 
-                        'Dim ctrl = CreateBaseControl(New DataGridView, guid, name, x, y, font, color)
-                        'AddExistingDatagridview(ctrl, row.Item("WIDTH"), row.Item("HEIGHT"))
                     Case "TABLE"
-                        Dim columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow) = (From r As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In DD_DMSLiteDataSet.TBPM_CONTROL_TABLE
-                                                                                           Where r.CONTROL_ID = guid
-                                                                                           Select r).ToList()
+                        Dim findControlColumnsQuery = (From r As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In DD_DMSLiteDataSet.TBPM_CONTROL_TABLE
+                                                       Where r.CONTROL_ID = guid
+                                                       Select r)
+                        Dim columns As List(Of DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow) = findControlColumnsQuery.ToList()
                         Dim table = ClassControlCreator.CreateExistingTable(row, columns, True)
 
                         AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
 
                         pnldesigner.Controls.Add(table)
                         SetMovementHandlers(table)
+
+                    Case "LINE"
+                        Dim line = ClassControlCreator.CreateExistingLine(row, True)
+                        pnldesigner.Controls.Add(line)
+                        SetMovementHandlers(line)
                 End Select
             Next
         Catch ex As Exception
-            MsgBox("Fehler bei Controls_laden: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
+            MsgBox("Fehler bei LoadControls " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
         End Try
 
     End Sub
-    Private Sub DragDropButtons_MouseDown(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown,
-            btnTabelle.MouseDown, btnCheckbox.MouseDown
-        MouseIsDown = True
-        CURRENT_CONTROL = Nothing
+    Private Sub DragDropButtons_MouseDown(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown, btnTabelle.MouseDown, btnCheckbox.MouseDown, btnLine.MouseDown
+        Mouse_IsPressed = True
+
+        CurrentControl = Nothing
         Try
             TBPM_PROFILE_CONTROLSBindingSource.Clear()
         Catch ex As Exception
-
         End Try
     End Sub
 
-    Private Sub DragDropButtons_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove, btntextbox.MouseMove, btncmb.MouseMove, btndtp.MouseMove, btnVektor.MouseMove, btnTabelle.MouseMove, btnCheckbox.MouseMove
-        If MouseIsDown Then
+    Private Sub DragDropButtons_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove, btntextbox.MouseMove, btncmb.MouseMove, btndtp.MouseMove, btnVektor.MouseMove, btnTabelle.MouseMove, btnCheckbox.MouseMove, btnLine.MouseMove
+        If Mouse_IsPressed Then
             Dim btn As Button = sender
             Dim dragDropData As String
 
             Select Case btn.Name
                 Case "btnlabel"
-                    dragDropData = "lbl"
+                    dragDropData = ClassControlCreator.PREFIX_LABEL
                 Case "btntextbox"
-                    dragDropData = "txt"
+                    dragDropData = ClassControlCreator.PREFIX_TEXTBOX
                 Case "btncmb"
-                    dragDropData = "cmb"
+                    dragDropData = ClassControlCreator.PREFIX_COMBOBOX
                 Case "btndtp"
-                    dragDropData = "dtp"
+                    dragDropData = ClassControlCreator.PREFIX_DATETIMEPICKER
                 Case "btnVektor"
-                    dragDropData = "dgv"
+                    dragDropData = ClassControlCreator.PREFIX_DATAGRIDVIEW
                 Case "btnTabelle"
-                    dragDropData = "tb"
+                    dragDropData = ClassControlCreator.PREFIX_TABLE
                 Case "btnCheckbox"
-                    dragDropData = "chk"
+                    dragDropData = ClassControlCreator.PREFIX_CHECKBOX
+                Case "btnLine"
+                    dragDropData = ClassControlCreator.PREFIX_LINE
             End Select
 
             btn.DoDragDrop(dragDropData, DragDropEffects.Copy)
         End If
     End Sub
 
+    Private Sub DragDropButtons_MouseUp(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseUp, btntextbox.MouseUp, btncmb.MouseUp, btndtp.MouseUp, btnVektor.MouseUp, btnTabelle.MouseUp, btnCheckbox.MouseUp, btnLine.MouseUp
+        Mouse_IsPressed = False
+    End Sub
+
     Private Sub pnlDesigner_DragDrop(sender As Object, e As DragEventArgs) Handles pnldesigner.DragDrop
         Dim cursorPosition As Point = pnldesigner.PointToClient(Cursor.Position)
 
+        Mouse_IsPressed = False
+
         Select Case e.Data.GetData(DataFormats.Text)
-            Case "lbl"
+            Case ClassControlCreator.PREFIX_LABEL
                 Dim label = ClassControlCreator.CreateNewLabel(cursorPosition)
                 SetMovementHandlers(label)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, Environment.UserName, label.Size.Height, label.Size.Width)
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, Environment.UserName, label.Size.Height, label.Size.Width)
 
-                CURRENT_CONTROL = label
-                CURRENT_CONTROL.Tag = GetLastID()
+                CurrentControl = label
+                CurrentControl.Tag = GetLastID()
 
                 pnldesigner.Controls.Add(label)
 
-                'AddNewLabel("lbl" & Random.ToString)
-            Case "txt"
+            Case ClassControlCreator.PREFIX_TEXTBOX
                 Dim txt = ClassControlCreator.CreateNewTextBox(cursorPosition)
                 SetMovementHandlers(txt)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, Environment.UserName, txt.Size.Height, txt.Size.Width)
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, Environment.UserName, txt.Size.Height, txt.Size.Width)
 
-                CURRENT_CONTROL = txt
-                CURRENT_CONTROL.Tag = GetLastID()
+                CurrentControl = txt
+                CurrentControl.Tag = GetLastID()
 
                 pnldesigner.Controls.Add(txt)
 
-                'AddNewTextbox("txt" & Random)
-            Case "cmb"
+            Case ClassControlCreator.PREFIX_COMBOBOX
                 Dim cmb = ClassControlCreator.CreateNewCombobox(cursorPosition)
                 SetMovementHandlers(cmb)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, Environment.UserName, cmb.Size.Height, cmb.Size.Width)
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, Environment.UserName, cmb.Size.Height, cmb.Size.Width)
 
-                CURRENT_CONTROL = cmb
-                CURRENT_CONTROL.Tag = GetLastID()
+                CurrentControl = cmb
+                CurrentControl.Tag = GetLastID()
 
                 pnldesigner.Controls.Add(cmb)
 
-                'AddNewCombobox("cmb" & random)
-            Case "dtp"
+            Case ClassControlCreator.PREFIX_DATETIMEPICKER
                 Dim dtp = ClassControlCreator.CreateNewDatetimepicker(cursorPosition)
                 SetMovementHandlers(dtp)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, Environment.UserName, dtp.Size.Height, dtp.Size.Width)
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, Environment.UserName, dtp.Size.Height, dtp.Size.Width)
 
-                CURRENT_CONTROL = dtp
-                CURRENT_CONTROL.Tag = GetLastID()
+                CurrentControl = dtp
+                CurrentControl.Tag = GetLastID()
 
                 pnldesigner.Controls.Add(dtp)
 
-                'AddNewDatetimepicker("dtp" & random)
-            Case "chk"
+            Case ClassControlCreator.PREFIX_CHECKBOX
                 Dim chk = ClassControlCreator.CreateNewCheckbox(cursorPosition)
                 SetMovementHandlers(chk)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, Environment.UserName, chk.Size.Height, chk.Size.Width)
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, Environment.UserName, chk.Size.Height, chk.Size.Width)
 
-                CURRENT_CONTROL = chk
-                CURRENT_CONTROL.Tag = GetLastID()
+                CurrentControl = chk
+                CurrentControl.Tag = GetLastID()
 
                 pnldesigner.Controls.Add(chk)
 
-                'AddNewCheckbox("chk" & random)
-            Case "dgv"
+            Case ClassControlCreator.PREFIX_DATAGRIDVIEW
                 Dim dgv = ClassControlCreator.CreateNewDatagridview(cursorPosition)
                 SetMovementHandlers(dgv)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dgv.Name, "DGV", dgv.Name, dgv.Location.X, dgv.Location.Y, Environment.UserName, dgv.Size.Height, dgv.Size.Width)
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dgv.Name, "DGV", dgv.Name, dgv.Location.X, dgv.Location.Y, Environment.UserName, dgv.Size.Height, dgv.Size.Width)
 
-                CURRENT_CONTROL = dgv
-                CURRENT_CONTROL.Tag = GetLastID()
+                CurrentControl = dgv
+                CurrentControl.Tag = GetLastID()
 
                 pnldesigner.Controls.Add(dgv)
 
-                'AddNewDGV("dgv" & random)
-            Case "tb"
+            Case ClassControlCreator.PREFIX_TABLE
                 Dim tb = ClassControlCreator.CreateNewTable(cursorPosition)
 
                 SetMovementHandlers(tb)
                 AddHandler tb.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, Environment.UserName, tb.Size.Height, tb.Size.Width)
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, Environment.UserName, tb.Size.Height, tb.Size.Width)
 
-                CURRENT_CONTROL = tb
-                CURRENT_CONTROL.Tag = GetLastID()
+                CurrentControl = tb
+                CurrentControl.Tag = GetLastID()
 
-                TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column1", "Column1", 95, Environment.UserName)
-                TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column2", "Column2", 95, Environment.UserName)
+                TBPM_CONTROL_TABLETableAdapter.Insert(CurrentControl.Tag, "column1", "Column1", 95, Environment.UserName)
+                TBPM_CONTROL_TABLETableAdapter.Insert(CurrentControl.Tag, "column2", "Column2", 95, Environment.UserName)
 
                 pnldesigner.Controls.Add(tb)
 
-                'AddNewTable("tb" & Random)
+            Case ClassControlCreator.PREFIX_LINE
+                Dim line = ClassControlCreator.CreateNewLine(cursorPosition)
+
+                SetMovementHandlers(line)
+
+                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, Environment.UserName, line.Size.Height, line.Size.Width)
+
+                CurrentControl = line
+                CurrentControl.Tag = GetLastID()
+
+
+                pnldesigner.Controls.Add(line)
         End Select
     End Sub
 
-    Private Sub pnlDesigner_DragEnter(sender As System.Object, e As System.Windows.Forms.DragEventArgs) Handles pnldesigner.DragEnter
+    Private Sub pnlDesigner_DragEnter(sender As System.Object, e As DragEventArgs) Handles pnldesigner.DragEnter
         ' Check the format of the data being dropped. 
         If (e.Data.GetDataPresent(DataFormats.Text)) Then
             ' Display the copy cursor. 
@@ -421,307 +322,18 @@ Public Class frmFormDesigner
             e.Effect = DragDropEffects.None
         End If
     End Sub
-    Private Function GetControlGUID(control_name As String)
-        Try
-            CURRENT_CONTROL_ID = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, control_name)
-            Return CURRENT_CONTROL_ID
-        Catch ex As Exception
-            MsgBox("Fehler bei GetControlGUID: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
-            Return 0
-        End Try
-    End Function
-    'Function AddNewLabel(lblname As String)
-    '    Try
-    '        Dim lbl As New Label
-    '        lbl.Name = lblname
-    '        lbl.Text = "Bez. definieren"
-    '        lbl.AutoSize = True
-    '        Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
-    '        lbl.Location = New Point(clientPosition)
-    '        pnldesigner.Controls.Add(lbl)
-    '        CURRENT_CONTROL = lbl
-
-    '        SetMovementHandlers(lbl)
-
-    '        TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, lbl.Name, "LBL", lblname, lbl.Location.X, lbl.Location.Y, Environment.UserName, 16, 200)
-    '        CURRENT_CONTROL.Tag = GetLastID()
-    '        'Load_Control()
-    '        btnsave.Visible = True
-    '    Catch ex As Exception
-    '        MsgBox("Fehler bei Anlegen Label: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-    '    End Try
-    'End Function
-    'Function AddExistingLabel(lbl As Label, text As String)
-    '    lbl.Text = text
-    '    lbl.AutoSize = True
-
-    '    pnldesigner.Controls.Add(lbl)
-    '    SetMovementHandlers(lbl)
-    'End Function
 
     Private Function GetLastID()
-        Dim sql = String.Format("SELECT MAX(GUID) FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0}", CURRENT_ProfilGUID)
+        Dim sql = String.Format("SELECT MAX(GUID) FROM TBPM_PROFILE_CONTROLS WHERE PROFIL_ID = {0}", ProfileId)
         Return ClassDatabase.Execute_Scalar(sql, MyConnectionString, True)
     End Function
-    Function AddNewTextbox(txtname As String)
-        Try
-            Dim txt As New TextBox
-            txt.Name = txtname
-            txt.Size = New Size(200, 27)
-            txt.Cursor = Cursors.Hand
-            txt.ReadOnly = True
-            Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
-            txt.Location = New Point(clientPosition)
-            txt.BackColor = Color.White
-            pnldesigner.Controls.Add(txt)
-            CURRENT_CONTROL = txt
-
-            SetMovementHandlers(txt)
-
-            TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, txt.Name, "TXT", txtname, txt.Location.X, txt.Location.Y, Environment.UserName, 27, 200)
-            CURRENT_CONTROL.Tag = GetLastID()
-
-            btnsave.Visible = True
-        Catch ex As Exception
-            MsgBox("Fehler bei Anlegen TextBox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Function
-    Function AddExistingTextbox(txt As TextBox, vwidth As Integer, vheight As Integer)
-        If vheight > 27 Then
-            txt.Multiline = True
-        Else
-            txt.Multiline = False
-        End If
-        txt.Size = New Size(vwidth, vheight)
-
-        txt.Cursor = Cursors.Hand
-        txt.ReadOnly = True
-        txt.BackColor = Color.White
-
-        pnldesigner.Controls.Add(txt)
-        SetMovementHandlers(txt)
-
-        btnsave.Visible = True
-    End Function
-    Function AddNewCheckbox(chkname As String)
-        Try
-
-            Dim chk As New CheckBox
-            chk.Name = chkname
-            'chk.Size = New Size(200, 27)
-            chk.AutoSize = True
-            chk.Text = "Beschriftung def."
-            chk.Cursor = Cursors.Hand
-            Dim clientPosition As Point = pnldesigner.PointToClient(Cursor.Position)
-            chk.Location = New Point(clientPosition)
-            pnldesigner.Controls.Add(chk)
-            CURRENT_CONTROL = chk
-
-            SetMovementHandlers(chk)
-
-            TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, chk.Name, "CHK", chkname, chk.Location.X, chk.Location.Y, Environment.UserName, 27, 200)
-            CURRENT_CONTROL.Tag = GetLastID()
-            'Load_Control()
-            btnsave.Visible = True
-        Catch ex As Exception
-            MsgBox("Fehler bei Anlegen Checkbox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Function
-    Function AddExistingCheckbox(chk As CheckBox, text As String, vwidth As Integer, vheight As Integer)
-        chk.AutoSize = True
-        chk.Text = text
-        chk.Cursor = Cursors.Hand
-
-        pnldesigner.Controls.Add(chk)
-        SetMovementHandlers(chk)
 
-        btnsave.Visible = True
-    End Function
-    Function AddNewCombobox(cmbname As String)
-        Try
-            Dim cmb As New ComboBox
-            cmb.Name = cmbname
-            cmb.Size = New Size(180, 24)
-            cmb.Cursor = Cursors.Hand
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(Cursor.Position)
-            cmb.Location = New Point(clientPosition)
-            pnldesigner.Controls.Add(cmb)
-            CURRENT_CONTROL = cmb
-
-            SetMovementHandlers(cmb)
-
-            TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, cmb.Name, "CMB", cmbname, cmb.Location.X, cmb.Location.Y, Environment.UserName, 24, 180)
-            CURRENT_CONTROL.Tag = GetLastID()
-            'Load_Control()
-            btnsave.Visible = True
-        Catch ex As Exception
-            MsgBox("Fehler bei Anlegen Combobox: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Function
-    Function AddExistingCombobox(cmb As ComboBox, vwidth As Integer, vheight As Integer)
-        cmb.Size = New Size(vwidth, vheight)
-        cmb.Cursor = Cursors.Hand
-
-        pnldesigner.Controls.Add(cmb)
-        SetMovementHandlers(cmb)
-
-        btnsave.Visible = True
-    End Function
-    Function AddExistingDatetimepicker(dtp As DateTimePicker, vwidth As Integer, vheight As Integer)
-        dtp.Size = New Size(vwidth, vheight)
-        dtp.Cursor = Cursors.Hand
-        dtp.Format = DateTimePickerFormat.Short
-        pnldesigner.Controls.Add(dtp)
-
-        SetMovementHandlers(dtp)
-        btnsave.Visible = True
-    End Function
-    Function AddNewDatetimepicker(dtpname As String)
-        Try
-            Dim dtp As New DateTimePicker
-            dtp.Name = dtpname
-            dtp.Size = New Size(180, 24)
-            dtp.Cursor = Cursors.Hand
-            dtp.Format = DateTimePickerFormat.Short
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(Cursor.Position)
-            dtp.Location = New Point(clientPosition)
-            pnldesigner.Controls.Add(dtp)
-            CURRENT_CONTROL = dtp
-
-            SetMovementHandlers(dtp)
-
-            TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dtp.Name, "DTP", dtpname, dtp.Location.X, dtp.Location.Y, Environment.UserName, 24, 180)
-            CURRENT_CONTROL.Tag = GetLastID()
-            'Load_Control()
-
-        Catch ex As Exception
-            MsgBox("Fehler bei Anlegen DatetimePicker: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Function
-    Function AddExistingDatagridview(dgv As DataGridView, vwidth As Integer, vheight As Integer)
-        dgv.Size = New Size(vwidth, vheight)
-        dgv.Cursor = Cursors.Hand
-        dgv.AllowUserToAddRows = False
-        dgv.AllowUserToDeleteRows = False
-        dgv.AllowUserToResizeColumns = False
-        dgv.AllowUserToResizeRows = False
-
-
-        Dim col As New DataGridViewTextBoxColumn
-        col.HeaderText = ""
-        col.Name = "column1"
-        dgv.Columns.Add(col)
-
-        pnldesigner.Controls.Add(dgv)
-
-        SetMovementHandlers(dgv)
-
-        btnsave.Visible = True
-    End Function
-    Function AddNewDGV(dgvName As String)
-        Try
-            Dim dgv As New DataGridView
-            dgv.Name = dgvName
-            dgv.Size = New Size(130, 150)
-            dgv.Cursor = Cursors.Hand
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
-            dgv.Location = New Point(clientPosition)
-            dgv.AllowUserToAddRows = False
-            dgv.AllowUserToDeleteRows = False
-            dgv.AllowUserToResizeColumns = False
-            dgv.AllowUserToResizeRows = False
-
-            Dim col As New DataGridViewTextBoxColumn
-            col.HeaderText = ""
-            col.Name = "column1"
-            dgv.Columns.Add(col)
-            pnldesigner.Controls.Add(dgv)
-            CURRENT_CONTROL = dgv
-
-            SetMovementHandlers(dgv)
-
-            TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, dgv.Name, "DGV", dgvName, dgv.Location.X, dgv.Location.Y, Environment.UserName, 130, 150)
-            CURRENT_CONTROL.Tag = GetLastID()
-            'Load_Control()
-        Catch ex As Exception
-            MsgBox("Fehler bei Anlegen DGV: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Function
-    Function AddNewTable(tableName As String)
-        Try
-            Dim table As New DataGridView
-            table.Name = tableName
-            table.Size = New Size(200, 150)
-            table.Cursor = Cursors.Hand
-            Dim clientPosition As Point = Me.pnldesigner.PointToClient(System.Windows.Forms.Cursor.Position)
-            table.Location = New Point(clientPosition)
-            table.AllowUserToAddRows = False
-            table.AllowUserToDeleteRows = False
-            table.AllowUserToResizeColumns = True
-            table.AllowUserToResizeRows = False
-
-            Dim col1 As New DataGridViewTextBoxColumn With {
-                .HeaderText = "Column1",
-                .Name = "column1"
-            }
-
-            Dim col2 As New DataGridViewTextBoxColumn With {
-                .HeaderText = "Column2",
-                .Name = "column2"
-            }
-
-            table.Columns.Add(col1)
-            table.Columns.Add(col2)
-            pnldesigner.Controls.Add(table)
-            CURRENT_CONTROL = table
-
-            SetMovementHandlers(table)
-
-            AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
-            TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(CURRENT_ProfilGUID, table.Name, "TABLE", tableName, table.Location.X, table.Location.Y, Environment.UserName, 130, 150)
-            CURRENT_CONTROL.Tag = GetLastID()
-            TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column1", "Column1", 95, Environment.UserName)
-            TBPM_CONTROL_TABLETableAdapter.Insert(CURRENT_CONTROL.Tag, "column2", "Column2", 95, Environment.UserName)
-            'Load_Control()
-        Catch ex As Exception
-            MsgBox("Fehler bei Anlegen Tabelle: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Function
-    Function AddExistingTable(table As DataGridView, vwidth As Integer, vheight As Integer)
-        table.Size = New Size(vwidth, vheight)
-        table.Cursor = Cursors.Hand
-        table.AllowUserToAddRows = False
-        table.AllowUserToDeleteRows = False
-        table.AllowUserToResizeColumns = True
-        table.AllowUserToResizeRows = False
-        CURRENT_CONTROL = table
-        'Columns laden
-        TBPM_CONTROL_TABLETableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE, table.Tag)
-        Dim DT As DataTable = Me.DD_DMSLiteDataSet.TBPM_CONTROL_TABLE
-        If DT.Rows.Count > 0 Then
-            For Each Row As DataRow In DT.Rows
-                Dim col As New DataGridViewTextBoxColumn
-                col.HeaderText = Row.Item("SPALTEN_HEADER")
-                col.Name = Row.Item("SPALTENNAME")
-                col.Width = Row.Item("SPALTENBREITE")
-                table.Columns.Add(col)
-            Next
-        End If
-
-        pnldesigner.Controls.Add(table)
-
-        SetMovementHandlers(table)
-
-        AddHandler table.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
-
-        btnsave.Visible = True
-    End Function
     Sub SetActiveControlColor()
-        CURRENT_CONTROL.BackColor = Color.DarkOrange
+        CurrentControl.BackColor = Color.DarkOrange
 
         ' Reset Color of all other controls
         For Each inctrl As Control In Me.pnldesigner.Controls
-            If inctrl.Name <> CURRENT_CONTROL.Name Then
+            If inctrl.Name <> CurrentControl.Name Then
                 Dim Type As String = inctrl.GetType.ToString
                 Select Case Type
                     Case "System.Windows.Forms.TextBox"
@@ -732,397 +344,112 @@ Public Class frmFormDesigner
                         inctrl.BackColor = Color.Transparent
                     Case "System.Windows.Forms.CheckBox"
                         inctrl.BackColor = Color.Transparent
+                    Case "DD_PM_WINDREAM.ClassControlCreator+LineLabel"
+                        inctrl.BackColor = inctrl.ForeColor
                 End Select
             End If
         Next
     End Sub
 
-    'Public Sub OndgvClick(sender As System.Object, e As System.EventArgs)
-    '    CURRENT_CONTROL = sender
-    '    Dim dgv As DataGridView = sender
-
-    '    CURRENT_CONTROL = dgv
-    '    If dgv.ColumnCount > 1 Then
-    '        Me.rbVektor.Visible = False
-    '        Load_Indexe_Vektor()
-    '        Dim selectedColumnCount As Integer = dgv.Columns.GetColumnCount(DataGridViewElementStates.Selected)
-    '        If selectedColumnCount > 0 Then
-    '            COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgv.SelectedColumns(selectedColumnCount).Name)
-    '        End If
-    '    Else
-    '        Load_indexe()
-    '        Me.rbVektor.Visible = True
-    '        COLUMN_GUID = Nothing
-    '    End If
-
-
-    '    'Load_Control()
-    '    Me.lblBeschriftung.Visible = False
-    '    Me.CTRL_TEXTTextBox.Visible = False
-    '    Me.lblIndex.Visible = True
-    '    Me.cmbIndex.Visible = True
-    '    Me.rbIndex.Visible = True
-
-    '    Me.CheckBoxAuswahlliste.Visible = False
-    '    Me.CHOICE_LISTTextBox.Visible = False
-    '    Me.lblAuswahlliste.Visible = False
-
-    '    Me.VALIDATIONCheckBox.Visible = True
-
-    '    gbxControl.Visible = True
-    '    CHOICE_LISTTextBox.Visible = False
-    '    'Me.pnlAuswahlliste.Enabled = False
-    '    Me.READ_ONLYCheckBox.Visible = True
-    '    Me.LOAD_IDX_VALUECheckBox.Visible = True
-    'End Sub
     Public Sub table_ColumnHeaderMouseClick(sender As System.Object, e As DataGridViewCellMouseEventArgs)
-        CURRENT_CONTROL = sender
+        CurrentControl = sender
         Dim dgv As DataGridView = sender
 
-        CURRENT_CONTROL = dgv
-        Me.rbVektor.Visible = False
+        CurrentControl = dgv
 
         Dim dgvColumn As DataGridViewColumn = dgv.Columns(e.ColumnIndex)
-        COLUMN_GUID = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgvColumn.Name)
-        If Application.OpenForms().OfType(Of frmControl_Detail).Any Then
-            '            MessageBox.Show("Opened")
-        Else
-            frmTableColumn = New frmControl_Detail
-            frmTableColumn.Show()
-        End If
-        frmTableColumn.FillData(COLUMN_GUID)
-        frmTableColumn.Text = "Konfiguration von Spalte: " & dgvColumn.Name
-
-        'Load_Control()
-        Me.lblBeschriftung.Visible = True
-        Me.CTRL_TEXTTextBox.Visible = True
-        Me.lblIndex.Visible = True
-        Me.cmbIndex.Visible = True
-        Me.rbIndex.Visible = True
-
-        Me.CheckBoxAuswahlliste.Visible = False
-        Me.CHOICE_LISTTextBox.Visible = False
-        Me.lblAuswahlliste.Visible = False
+        Dim columnId = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgvColumn.Name)
+        Dim frmTableColumn = New frmControl_Detail()
 
-        Me.VALIDATIONCheckBox.Visible = True
-
-        gbxControl.Visible = True
-        ' Me.pnlAuswahlliste.Enabled = False
-        Me.READ_ONLYCheckBox.Visible = True
-        Me.LOAD_IDX_VALUECheckBox.Visible = True
+        frmTableColumn.FillData(columnId)
+        frmTableColumn.Text = "Konfiguration von Spalte: " & dgvColumn.Name
+        frmTableColumn.Show()
     End Sub
-    Sub IDX_CMB(controlname As String)
-        Try
-            Dim guid As Integer = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, controlname)
-            Dim indexname As String = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetIndexname(guid)
-            'If indexname.StartsWith("[%") Then
-            '    indexname = indexname.Replace("[%", "")
-            'End If
-            cmbIndex.SelectedIndex = cmbIndex.FindStringExact(indexname)
-        Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "IDX_CMB:")
-        End Try
 
-    End Sub
-    Sub delete_Control(_ctrlname As String)
+    Sub DeleteControl(controlName As String)
         Try
-            Dim result As MsgBoxResult = MsgBox("Wollen Sie das Control: " & _ctrlname & " wirklich löschen?", MsgBoxStyle.YesNo, "Bestätigung:")
+            Dim result As MsgBoxResult = MsgBox("Wollen Sie das Control: " & controlName & " wirklich löschen?", MsgBoxStyle.YesNo, "Bestätigung:")
             ' wenn Speichern ja
             If result = MsgBoxResult.Yes Then
-                Dim guid As Integer = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(CURRENT_ProfilGUID, _ctrlname)
-                If guid > 0 Then
-                    Me.TBPM_CONTROL_TABLETableAdapter.Delete(guid)
-                    TBPM_PROFILE_CONTROLSTableAdapter.Delete(guid)
-                    Controls_laden()
+                Dim controlId As Integer = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(ProfileId, controlName)
+                If controlId > 0 Then
+                    Me.TBPM_CONTROL_TABLETableAdapter.Delete(controlId)
+                    TBPM_PROFILE_CONTROLSTableAdapter.Delete(controlId)
+                    LoadControls()
                 End If
             End If
         Catch ex As Exception
-            MsgBox(ex.Message, MsgBoxStyle.Critical, "delete_Control:")
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "DeleteControl:")
         End Try
     End Sub
     ' +++ Public Helper Methods +++
     Public Function GetCursorPosition() As Point
         Return pnldesigner.PointToClient(Cursor.Position)
     End Function
-    Sub Clear_control_Details()
-        Try
-            CURRENT_CONTROL = Nothing
-            TBPM_PROFILE_CONTROLSBindingSource.Clear()
-
-        Catch ex As Exception
-
-        End Try
-    End Sub
-
-    'Private Sub MovableDGV_MouseDown(ByVal sender As Object, ByVal e As System.Windows.Forms.MouseEventArgs) Handles MyBase.MouseDown
-    '    ' Check to see if the correct button has been pressed
-    '    If e.Button = Windows.Forms.MouseButtons.Left And Cursor = Cursors.Default Then
-    '        Clear_control_Details()
-    '        Dim dgv As DataGridView = DirectCast(sender, DataGridView)
-    '        Dim relativeMousePosition As Point = dgv.PointToClient(Cursor.Position)
-    '        Dim hit As DataGridView.HitTestInfo = dgv.HitTest(relativeMousePosition.X, relativeMousePosition.Y)
-    '        If hit.Type.ToString = "ColumnHeader" Then
-    '            Exit Sub
-    '        End If
-
-    '        CURRENT_CONTROL = sender
-
-    '        BeginLocation = e.Location
-    '        CURRENT_CONTROL.Tag = New clsDragInfo(Form.MousePosition, sender.Location)
-    '        dgv.BringToFront()
-    '        ' Set the mode flag to signal the MouseMove event handler that it
-    '        ' needs to now calculate new positions for our control
-    '        MouseMoving = True
-
-    '        CURRENT_CONTROL = sender
-
-    '        'Jetzt Controleigenschaften laden
-    '        SetActiveControlColor()
-    '        'Load_Control()
-
-    '        gbxControl.Visible = True
-    '    End If
-    'End Sub
-
-    'Private Sub btnsave_Click(sender As System.Object, e As System.EventArgs) Handles btnsave.Click
-    '    Save_Control()
-    'End Sub
-    Sub Save_Control()
-        Try
-            If rbVektor.Checked Then
-                If INDEX_NAMETextBox.Text = "" Then
-                    MsgBox("Bitte definieren Sie den Bezeichner für dieses Processmanager-Item:", MsgBoxStyle.Exclamation)
-                    Me.INDEX_NAMETextBox.BackColor = Color.Red
-                    Exit Sub
-                Else
-                    Me.INDEX_NAMETextBox.BackColor = Color.White
-                End If
-                ' INDEX_NAME_VALUE.Text = "[%VKT" & INDEX_NAMETextBox.Text
-            End If
-            TBPM_PROFILE_CONTROLSBindingSource.EndEdit()
-            If DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS.GetChanges Is Nothing = False Then
-                Me.CHANGED_WHOTextBox.Text = Environment.UserName
-                TBPM_PROFILE_CONTROLSBindingSource.EndEdit()
-                TBPM_PROFILE_CONTROLSTableAdapter.Update(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS)
-                tslblAenderungen.Visible = True
-                tslblAenderungen.Text = "Änderungen gespeichert - " & Now
-            Else
-                tslblAenderungen.Visible = False
-            End If
-            'Wenn Datagridview dann Speichern
-            Dim type As String = CURRENT_CONTROL.GetType.ToString
-            If type.Contains("DataGridView") Then
-                Dim dgv As DataGridView = DirectCast(CURRENT_CONTROL, DataGridView)
-                If dgv.ColumnCount > 1 Then
-                    'For Each col As DataColumn In dgv.Columns
-                    '    MsgBox(col.ColumnName)
-                    'Next
-                End If
-            End If
-        Catch ex As Exception
-            If ex.Message.ToLower.Contains("interne datatable") = True Or ex.Message.ToLower.Contains("internal index is corrupted") = True Then
-                Save_Control()
-            ElseIf ex.Message.ToLower.Contains("geöffneter datareader") = True Then
-                Exit Sub
-            Else
-                MsgBox(ex.Message, MsgBoxStyle.Critical, "Save Control:")
-            End If
-        End Try
-
-    End Sub
-
-    'Private Sub cmbIndex_SelectedIndexChanged(sender As System.Object, e As System.EventArgs) Handles cmbIndex.SelectedIndexChanged
-    '    If cmbIndex.SelectedIndex <> -1 Then
-    '        If cmbIndex.Text = "DD PM-ONLY FOR DISPLAY" Then
-    '            LOAD_IDX_VALUECheckBox.Checked = False
-    '            LOAD_IDX_VALUECheckBox.Enabled = False
-    '            READ_ONLYCheckBox.Checked = True
-    '            VALIDATIONCheckBox.Checked = False
-    '            VALIDATIONCheckBox.Enabled = False
-    '        Else
-    '            LOAD_IDX_VALUECheckBox.Enabled = True
-    '            VALIDATIONCheckBox.Enabled = True
-    '        End If
-    '        If _loading = False Then
-    '            Save_Control()
-    '        End If
-    '    End If
-    'End Sub
-    'Private Sub btncmb_MouseMove(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btncmb.MouseMove
-    '    If MouseIsDown Then
-    '        ' Initiate dragging. 
-    '        btncmb.DoDragDrop("cmb", DragDropEffects.Copy)
-    '    End If
-    '    MouseIsDown = False
-    'End Sub
-
-    'Private Sub CheckBox1_CheckedChanged(sender As System.Object, e As System.EventArgs) Handles CheckBoxAuswahlliste.CheckedChanged
-    '    If CheckBoxAuswahlliste.Checked Then
-    '        lblAuswahlliste.Visible = True
-    '        CHOICE_LISTTextBox.Visible = True
-    '    Else
-    '        lblAuswahlliste.Visible = False
-    '        CHOICE_LISTTextBox.Visible = False
-    '    End If
-    'End Sub
-
 
     Private Sub btndelete_Click(sender As System.Object, e As EventArgs) Handles btndelete.Click
-        If CURRENT_CONTROL Is Nothing = False Then
-            delete_Control(CURRENT_CONTROL.Name)
+        If CurrentControl Is Nothing = False Then
+            DeleteControl(CurrentControl.Name)
             TabControlEigenschaften.Enabled = False
         End If
     End Sub
 
     Private Sub btnwidth_plus_Click(sender As System.Object, e As EventArgs) Handles btnwidth_plus.Click
-        If CURRENT_CONTROL Is Nothing = False Then
-            CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width + 5, CURRENT_CONTROL.Height)
-            UpdateSingleValue("WIDTH", CURRENT_CONTROL.Size.Width)
+        If CurrentControl Is Nothing = False Then
+            CurrentControl.Size = New Size(CurrentControl.Width + 5, CurrentControl.Height)
+            UpdateSingleValue("WIDTH", CurrentControl.Size.Width)
         End If
     End Sub
 
     Private Sub btnwidth_minus_Click(sender As System.Object, e As EventArgs) Handles btnwidth_minus.Click
-        If CURRENT_CONTROL Is Nothing = False Then
-            CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width - 5, CURRENT_CONTROL.Height)
-            UpdateSingleValue("WIDTH", CURRENT_CONTROL.Size.Width)
+        If CurrentControl Is Nothing = False Then
+            Dim newWidth = CurrentControl.Width - 5
+
+            ' Verhindert, dass das Control unsichtbar wird
+            If newWidth > 1 Then
+                Exit Sub
+            End If
+
+            CurrentControl.Size = New Size(newWidth, CurrentControl.Height)
+            UpdateSingleValue("WIDTH", CurrentControl.Size.Width)
         End If
     End Sub
 
     Private Sub btnheight_plus_Click(sender As System.Object, e As EventArgs) Handles btnheight_plus.Click
-        If CURRENT_CONTROL Is Nothing = False Then
-            Dim newHeight As Integer = CURRENT_CONTROL.Height + 5
+        If CurrentControl Is Nothing = False Then
+            Dim newHeight As Integer = CurrentControl.Height + 5
 
-            If newHeight > 21 And TypeOf CURRENT_CONTROL Is TextBox Then
-                DirectCast(CURRENT_CONTROL, TextBox).Multiline = True
+            If newHeight > 21 And TypeOf CurrentControl Is TextBox Then
+                DirectCast(CurrentControl, TextBox).Multiline = True
             End If
-            CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width, newHeight)
+
+            CurrentControl.Size = New Size(CurrentControl.Width, newHeight)
             UpdateSingleValue("WIDTH", newHeight)
         End If
     End Sub
 
     Private Sub btnheight_minus_Click(sender As System.Object, e As EventArgs) Handles btnheight_minus.Click
-        If CURRENT_CONTROL Is Nothing = False Then
-            Dim newHeight As Integer = CURRENT_CONTROL.Height - 5
+        If CurrentControl Is Nothing = False Then
+            Dim newHeight As Integer = CurrentControl.Height - 5
 
-            If newHeight < 22 And TypeOf CURRENT_CONTROL Is TextBox Then
-                DirectCast(CURRENT_CONTROL, TextBox).Multiline = True
+            If newHeight < 22 And TypeOf CurrentControl Is TextBox Then
+                DirectCast(CurrentControl, TextBox).Multiline = True
             End If
-            CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Width, newHeight)
-            UpdateSingleValue("WIDTH", newHeight)
-        End If
-    End Sub
-
-    Private Sub Button2_MouseMove(sender As System.Object, e As MouseEventArgs) Handles btndtp.MouseMove
-        If MouseIsDown Then
-            'Initiate dragging. 
-            btndtp.DoDragDrop("dtp", DragDropEffects.Copy)
-        End If
-        MouseIsDown = False
-    End Sub
-
-
 
-    Private Sub btnVektor_MouseMove(sender As Object, e As MouseEventArgs) Handles btnVektor.MouseMove
-        If MouseIsDown Then
-            'Initiate dragging. 
-            btnVektor.DoDragDrop("dgv", DragDropEffects.Copy)
-        End If
-        MouseIsDown = False
-    End Sub
-    Private Sub btnTabelle_MouseMove(sender As Object, e As MouseEventArgs) Handles btnTabelle.MouseMove
-        If MouseIsDown Then
-            'Initiate dragging. 
-            btnVektor.DoDragDrop("tb", DragDropEffects.Copy)
-        End If
-        MouseIsDown = False
-    End Sub
-    Private Sub Button1_MouseMove(sender As Object, e As MouseEventArgs) Handles btnCheckbox.MouseMove
-        If MouseIsDown Then
-            'Initiate dragging. 
-            btnCheckbox.DoDragDrop("chk", DragDropEffects.Copy)
-        End If
-        MouseIsDown = False
-    End Sub
+            ' Verhindert, dass das Control unsichtbar wird
+            If newHeight > 1 Then
+                Exit Sub
+            End If
 
-    'Private Sub rbIndex_CheckedChanged(sender As Object, e As EventArgs) Handles rbIndex.CheckedChanged
-    '    If rbIndex.Checked Then
-    '        cmbIndex.Visible = True
-    '        INDEX_NAMETextBox.Visible = False
-    '        lblIndex.Text = "Zugeordneter Index"
-    '    Else
-    '        cmbIndex.Visible = False
-    '        INDEX_NAMETextBox.Visible = True
-    '        lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
-    '    End If
-    'End Sub
-
-    'Private Sub rbVektor_CheckedChanged(sender As Object, e As EventArgs) Handles rbVektor.CheckedChanged
-    '    If rbVektor.Checked Then
-    '        Me.INDEX_NAMETextBox.Visible = True
-    '        Me.cmbIndex.Visible = False
-    '        Me.lblIndex.Text = "Bezeichner und getätigte Eingabe werden in das Vektorfeld geschrieben"
-    '    Else
-    '        Me.INDEX_NAMETextBox.Visible = False
-    '        Me.cmbIndex.Visible = True
-    '        Me.lblIndex.Text = "Zugeordneter Index"
-    '    End If
-    'End Sub
-
-    Private Sub INDEX_NAMETextBox_Leave(sender As Object, e As EventArgs) Handles INDEX_NAMETextBox.Leave
-        If INDEX_NAMETextBox.Text <> "" And CURRENT_CONTROL_ID <> 0 Then
-            TBPM_PROFILE_CONTROLSTableAdapter.cmdUpdateIndexname("[%VKT" & INDEX_NAMETextBox.Text, Environment.UserName, CURRENT_CONTROL_ID)
+            CurrentControl.Size = New Size(CurrentControl.Width, newHeight)
+            UpdateSingleValue("WIDTH", newHeight)
         End If
     End Sub
 
-    Private Sub READ_ONLYCheckBox_CheckedChanged(sender As Object, e As EventArgs) Handles READ_ONLYCheckBox.CheckedChanged
-        If READ_ONLYCheckBox.Checked Then
-            Me.VALIDATIONCheckBox.Checked = True
-            Me.LOAD_IDX_VALUECheckBox.Checked = True
-        End If
-    End Sub
     Private Sub btnrefresh_Click(sender As Object, e As EventArgs) Handles btnrefresh.Click
-        Controls_laden()
+        LoadControls()
     End Sub
 
-    Private Sub btnShowConnections_Click(sender As Object, e As EventArgs) Handles btnShowConnections.Click
-        frmConnection.ShowDialog()
-        Try
-            Me.TBPM_CONNECTIONTableAdapter.Fill(Me.DD_DMSLiteDataSet.TBPM_CONNECTION)
-        Catch ex As Exception
-            ClassLogger.Add(ex.Message)
-        End Try
-    End Sub
-
-    Private Sub btnEditor_Click(sender As Object, e As EventArgs) Handles btnEditor.Click
-        Dim CONID = 0
-        If cmbConnection.SelectedValue > 0 Then
-            CONID = cmbConnection.SelectedValue
-        End If
-        TBPM_PROFILE_CONTROLSBindingSource.EndEdit()
-        If DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS.GetChanges Is Nothing = False Then
-            Me.CHANGED_WHOTextBox.Text = Environment.UserName
-            TBPM_PROFILE_CONTROLSBindingSource.EndEdit()
-            TBPM_PROFILE_CONTROLSTableAdapter.Update(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS)
-        End If
-        If CURRENT_CONTROL_ID <> 0 Then
-            Dim sql = "SELECT T.CONNECTION_ID,T1.BEZEICHNUNG AS 'CON_STRING',ISNULL(T.SQL_UEBERPRUEFUNG,'') AS 'SQL_COMMAND' FROM TBPM_PROFILE_CONTROLS T, TBPM_CONNECTION T1 WHERE " &
-           "T.CONNECTION_ID = T1.GUID AND T.GUID = " & CURRENT_CONTROL_ID
-            CURRENT_DT_SQL_CONFIG_TABLE = ClassDatabase.Return_Datatable(sql, True)
-            CURRENT_INDEX_ID = CURRENT_CONTROL_ID
-            CURRENT_DESIGN_TYPE = "INPUT_INDEX"
-            CURRENT_SQL_COMAMND = SQL_CommandTextBox.Text
-            CURRENT_SQL_CON = CONID
-            frmSQL_DESIGNER.ShowDialog()
-
-            'Load_Control(CURRENT_CONTROL_ID)
-            TabControlEigenschaften.SelectedIndex = 2
-        Else
-            MsgBox("Please choose a control!", MsgBoxStyle.Information)
-        End If
-
-    End Sub
-
-#Region "Rewrite"
     ''' <summary>
     ''' Setzt die Eventhandler für ein Control, die für die Bewegung via Drag & Drop und das Laden der Eigentschaften verantwortlich sind
     ''' </summary>
@@ -1135,13 +462,13 @@ Public Class frmFormDesigner
 
     Private Sub OnControl_MouseDown(sender As Control, e As MouseEventArgs)
         If e.Button = MouseButtons.Left Then
-            CURRENT_CONTROL = sender
+            CurrentControl = sender
             Mouse_BeginLocation = e.Location
             sender.BringToFront()
 
             Mouse_IsPressed = True
 
-            Console.WriteLine("CURRENT_CONTROL:" & CURRENT_CONTROL.Name)
+            Console.WriteLine("CURRENT_CONTROL:" & CurrentControl.Name)
         End If
     End Sub
 
@@ -1154,26 +481,51 @@ Public Class frmFormDesigner
         ' Control Eigenschaften laden
         LoadControlProperties(sender)
 
-        If Mouse_IsMoving Then
-            Mouse_IsMoving = False
+        If Mouse_IsMoving = False Then
+            MyBase.Cursor = Cursors.Default
+            Exit Sub
+        End If
 
-            Dim CurrentPosition = CURRENT_CONTROL.Location
-            Dim OldPosition As Point = DirectCast(pgControls.SelectedObject, BaseProperties).Location
+        Mouse_IsMoving = False
 
-            If Point.op_Inequality(CurrentPosition, OldPosition) Then
-                DirectCast(pgControls.SelectedObject, BaseProperties).Location = CURRENT_CONTROL.Location
+        Dim CurrentPosition = CurrentControl.Location
+        Dim OldPosition As Point = DirectCast(pgControls.SelectedObject, BaseProperties).Location
 
-                UpdateSingleValue("X_LOC", CURRENT_CONTROL.Location.X)
-                UpdateSingleValue("Y_LOC", CURRENT_CONTROL.Location.Y)
-            End If
+        If Not Point.op_Inequality(CurrentPosition, OldPosition) Then
+            MyBase.Cursor = Cursors.Default
+            Exit Sub
         End If
 
+        ' Das Control sollte nicht außerhalb des Panels geschoben werden (Koordinaten kleiner 0)
+        If CurrentPosition.X < 0 Then
+            CurrentControl.Location = New Point(0, CurrentControl.Location.Y)
+        End If
+
+        If CurrentPosition.Y < 0 Then
+            CurrentControl.Location = New Point(CurrentControl.Location.X, 0)
+        End If
+
+        ' Ebenso nicht über die Größe des Panels (X-Achse)
+        If CurrentPosition.X > pnldesigner.Width Then
+            CurrentControl.Location = New Point(pnldesigner.Width - CurrentControl.Width, CurrentControl.Location.Y)
+        End If
+
+        ' Ebenso nicht über die Größe des Panels (Y-Achse)
+        If CurrentPosition.Y > pnldesigner.Height Then
+            CurrentControl.Location = New Point(CurrentControl.Location.X, pnldesigner.Height - CurrentControl.Height)
+        End If
+
+        DirectCast(pgControls.SelectedObject, BaseProperties).Location = CurrentControl.Location
+
+        UpdateSingleValue("X_LOC", CurrentControl.Location.X)
+        UpdateSingleValue("Y_LOC", CurrentControl.Location.Y)
+
         MyBase.Cursor = Cursors.Default
     End Sub
 
     Private Sub OnControl_MouseMove(sender As Control, e As MouseEventArgs)
         Try
-            If CURRENT_CONTROL Is Nothing Then
+            If CurrentControl Is Nothing Then
                 Exit Sub
             End If
 
@@ -1186,7 +538,7 @@ Public Class frmFormDesigner
                 Dim CurrentPosition As Point = GetCursorPosition()
 
                 If Point.op_Inequality(CurrentPosition, Mouse_BeginLocation) Then
-                    CURRENT_CONTROL.Location = New Point(CurrentPosition.X - Mouse_BeginLocation.X, CurrentPosition.Y - Mouse_BeginLocation.Y)
+                    CurrentControl.Location = New Point(CurrentPosition.X - Mouse_BeginLocation.X, CurrentPosition.Y - Mouse_BeginLocation.Y)
                 End If
             End If
         Catch ex As Exception
@@ -1250,27 +602,26 @@ Public Class frmFormDesigner
 
         ' 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
-        TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, CURRENT_ProfilGUID)
+        TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, ProfileId)
 
         row = dt.AsEnumerable().Where(Function(r As DataRow)
                                           Return r.Item("GUID") = sender.Tag
                                       End Function).Single()
 
         ' Globale Variablen setzen
-        CURRENT_CONTROL = sender
+        CurrentControl = sender
         CURRENT_CONTROL_ID = sender.Tag
 
         SetActiveControlColor()
 
-        gbxControl.Visible = True
-
-        'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden
-        Dim indicies As List(Of String) = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
-        Dim choiceLists As List(Of String) = clsWD_GET.GetChoiceLists()
-
         ' Mithilfe von CreatePropsObject(WithIndicies) wird ein Basis Objekt mit grundlegenden
         ' Eigenschaften angelegt. Danach können für jeden Control Typ spezifische Eigenschaften festgelegt werden.
-        If TypeOf sender Is Label Then
+        If TypeOf sender Is ClassControlCreator.LineLabel Then
+            Dim line As ClassControlCreator.LineLabel = sender
+            Dim lineProps As LineLabelProperties = CreatePropsObject(New LineLabelProperties, row)
+
+            props = lineProps
+        ElseIf TypeOf sender Is Label Then
             Dim label As Label = sender
             Dim labelProps As LabelProperties = CreatePropsObject(New LabelProperties, row)
             labelProps.Text = label.Text
@@ -1278,32 +629,32 @@ Public Class frmFormDesigner
             props = labelProps
         ElseIf TypeOf sender Is CheckBox Then
             Dim check As CheckBox = sender
-            Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, row, indicies)
+            Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, row, Windream_Indicies)
             checkProps.Text = check.Text
 
             props = checkProps
         ElseIf TypeOf sender Is TextBox Then
             Dim txt As TextBox = sender
-            Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, indicies)
+            Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, Windream_Indicies)
 
             props = txtProps
 
         ElseIf TypeOf sender Is ComboBox Then
             Dim cmb As ComboBox = sender
-            Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, row, indicies)
-            cmbProps.ChoiceLists = choiceLists
+            Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, row, Windream_Indicies)
+            cmbProps.ChoiceLists = Windream_ChoiceLists
             cmbProps.ChoiceList = NotNull(row.Item("CHOICE_LIST"), "")
 
             props = cmbProps
 
         ElseIf TypeOf sender Is DateTimePicker Then
             Dim dtp As DateTimePicker = sender
-            Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, indicies)
+            Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Windream_Indicies)
 
             props = dtpProps
         ElseIf TypeOf sender Is DataGridView Then
             Dim grid As DataGridView = sender
-            Dim gridProps As GridViewProperties = CreatePropsObjectWithIndicies(New GridViewProperties, row, indicies)
+            Dim gridProps As GridViewProperties = CreatePropsObjectWithIndicies(New GridViewProperties, row, Windream_VectorIndicies)
 
             props = gridProps
         Else
@@ -1325,38 +676,38 @@ Public Class frmFormDesigner
                 UpdateSingleValue("X_LOC", DirectCast(newValue, Point).X)
                 UpdateSingleValue("Y_LOC", DirectCast(newValue, Point).Y)
 
-                CURRENT_CONTROL.Location = newValue
+                CurrentControl.Location = newValue
 
             Case "X"
                 UpdateSingleValue("X_LOC", CInt(newValue))
 
-                CURRENT_CONTROL.Location = New Point(newValue, CURRENT_CONTROL.Location.Y)
+                CurrentControl.Location = New Point(newValue, CurrentControl.Location.Y)
 
             Case "Y"
                 UpdateSingleValue("Y_LOC", CInt(newValue))
 
-                CURRENT_CONTROL.Location = New Point(CURRENT_CONTROL.Location.X, newValue)
+                CurrentControl.Location = New Point(CurrentControl.Location.X, newValue)
 
             Case "Size"
                 UpdateSingleValue("WIDTH", DirectCast(newValue, Size).Width)
                 UpdateSingleValue("HEIGHT", DirectCast(newValue, Size).Height)
 
-                CURRENT_CONTROL.Size = newValue
+                CurrentControl.Size = newValue
 
             Case "Width"
                 UpdateSingleValue("WIDTH", CInt(newValue))
 
-                CURRENT_CONTROL.Size = New Size(newValue, CURRENT_CONTROL.Size.Height)
+                CurrentControl.Size = New Size(newValue, CurrentControl.Size.Height)
 
             Case "Height"
                 UpdateSingleValue("HEIGHT", CInt(newValue))
 
-                CURRENT_CONTROL.Size = New Size(CURRENT_CONTROL.Size.Width, newValue)
+                CurrentControl.Size = New Size(CurrentControl.Size.Width, newValue)
 
             Case "Name"
                 UpdateSingleValue("NAME", newValue)
 
-                CURRENT_CONTROL.Name = newValue
+                CurrentControl.Name = newValue
 
             Case "Index"
                 UpdateSingleValue("INDEX_NAME", newValue)
@@ -1364,7 +715,7 @@ Public Class frmFormDesigner
             Case "Text"
                 UpdateSingleValue("CTRL_TEXT", newValue)
 
-                CURRENT_CONTROL.Text = newValue
+                CurrentControl.Text = newValue
 
             Case "Required"
                 UpdateSingleValue("VALIDATION", IIf(newValue = True, 1, 0))
@@ -1379,12 +730,12 @@ Public Class frmFormDesigner
                 UpdateSingleValue("FONT_FAMILY", font.FontFamily.Name)
                 UpdateSingleValue("FONT_STYLE", font.Style.ToString)
 
-                CURRENT_CONTROL.Font = font
+                CurrentControl.Font = font
             Case "TextColor"
                 Dim color As Color = newValue
                 UpdateSingleValue("FONT_COLOR", ColorToInt(color))
 
-                CURRENT_CONTROL.ForeColor = color
+                CurrentControl.ForeColor = color
             Case "SQLCommand"
                 UpdateSingleValue("SQL_UEBERPRUEFUNG", newValue)
                 UpdateSingleValue("CHOICE_LIST", "")
@@ -1399,7 +750,7 @@ Public Class frmFormDesigner
         Dim guid As Integer = CURRENT_CONTROL_ID
         Dim escapedValue = value
 
-        ' Strings und SQL-Commands müssen vor dem speichern escaped und mit Anführungszeichen versehen werden
+        ' Strings und SQL-Commands müssen vor dem Speichern escaped und mit Anführungszeichen versehen werden
         If TypeOf value Is String Then
             escapedValue = $"'{value}'"
         ElseIf TypeOf value Is InputProperties.SQLValue Then
@@ -1418,5 +769,4 @@ Public Class frmFormDesigner
             ClassLogger.Add(msg)
         End Try
     End Sub
-#End Region
 End Class
\ No newline at end of file
diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.vb b/app/DD_PM_WINDREAM/frmProfileDesigner.vb
index 6223f93..3cbf288 100644
--- a/app/DD_PM_WINDREAM/frmProfileDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmProfileDesigner.vb
@@ -221,7 +221,12 @@ Public Class frmProfileDesigner
             My.Settings.Save()
             CURRENT_OBJECTTYPE = cmbObjekttypen.Text
             CURRENT_ProfilName = NAMETextBox.Text
+
+            frmFormDesigner.ProfileId = CURRENT_ProfilGUID
+            frmFormDesigner.ProfileName = CURRENT_ProfilName
+            frmFormDesigner.ProfileObjectType = cmbObjekttypen.Text
             frmFormDesigner.ShowDialog()
+
         Else
             MsgBox("Eindeutiges Profil konnte nicht an den FormDesigner weitergegeben werden:", MsgBoxStyle.Exclamation)
         End If
diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb
index e6a125e..475869c 100644
--- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb
@@ -396,6 +396,7 @@ Partial Class frmValidator
         'TableAdapterManager
         '
         Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_CONNECTIONTableAdapter = Me.TBPM_CONNECTIONTableAdapter
         Me.TableAdapterManager.TBPM_CONTROL_TABLETableAdapter = Me.TBPM_CONTROL_TABLETableAdapter
         Me.TableAdapterManager.TBPM_ERROR_LOGTableAdapter = Nothing
@@ -406,7 +407,6 @@ Partial Class frmValidator
         Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Me.TBPM_PROFILE_FINAL_INDEXINGTableAdapter
         Me.TableAdapterManager.TBPM_PROFILETableAdapter = Me.TBPM_PROFILETableAdapter
         Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
         '
         'TBPM_CONNECTIONTableAdapter
@@ -966,6 +966,7 @@ Partial Class frmValidator
         Me.SplitContainer1.Size = New System.Drawing.Size(962, 593)
         Me.SplitContainer1.SplitterDistance = 477
         Me.SplitContainer1.TabIndex = 37
+        Me.SplitContainer1.TabStop = False
         '
         'grpbxMailBody
         '
diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index fce8dce..0a81502 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -655,7 +655,7 @@ Public Class frmValidator
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch DTP zu laden", False)
                         ctrl = ClassControlCreator.CreateExistingDatepicker(dr, False)
 
-                        add_DTP(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
+                        'add_DTP(dr.Item("GUID"), dr.Item("NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), CInt(dr.Item("WIDTH")), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"), dr.Item("LOAD_IDX_VALUE")) 'dr.Item("INDEX_NAME"), 
                     Case "DGV"
                         If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch DGV zu laden", False)
                         Dim dgv = ClassControlCreator.CreateExistingDataGridView(dr, False)
@@ -679,6 +679,10 @@ Public Class frmValidator
 
                         ctrl = ClassControlCreator.CreateExistingTable(dr, columns, False)
                         'add_TABLE(dr.Item("GUID"), dr.Item("CTRL_NAME"), CInt(dr.Item("X_LOC")), CInt(dr.Item("Y_LOC")), dr.Item("WIDTH"), CInt(dr.Item("HEIGHT")), dr.Item("READ_ONLY"))
+                    Case "LINE"
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Versuch Linie zu laden", False)
+
+                        ctrl = ClassControlCreator.CreateExistingLine(dr, False)
                 End Select
 
                 If first_control Is Nothing Then

From c98135429f4f0c761ad86d0e932f64a6d71535c3 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Wed, 4 Apr 2018 11:43:44 +0200
Subject: [PATCH 05/14] jj: add location to dgv, change size of linelabel

---
 app/DD_PM_WINDREAM/ClassControlCreator.vb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/DD_PM_WINDREAM/ClassControlCreator.vb b/app/DD_PM_WINDREAM/ClassControlCreator.vb
index 7b14251..42eb94d 100644
--- a/app/DD_PM_WINDREAM/ClassControlCreator.vb
+++ b/app/DD_PM_WINDREAM/ClassControlCreator.vb
@@ -141,6 +141,7 @@ Public Class ClassControlCreator
             .Name = $"{PREFIX_DATAGRIDVIEW}_{clsTools.ShortGUID}",
             .Size = New Size(DEFAULT_WIDTH, DEFAULT_HEIGHT_TABLE),
             .Cursor = Cursors.Hand,
+            .Location = location,
             .AllowUserToAddRows = False,
             .AllowUserToDeleteRows = False,
             .AllowUserToResizeColumns = False,
@@ -184,6 +185,7 @@ Public Class ClassControlCreator
         Dim control As New LineLabel With {
             .Name = $"{PREFIX_LINE}_{clsTools.ShortGUID}",
             .Text = "---------------------------------",
+            .Size = New Size(100, 5),
             .Location = location
         }
 

From 6f69efda4d1fa544b7085702062fe58a269048dd Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Wed, 4 Apr 2018 11:48:51 +0200
Subject: [PATCH 06/14] jj: filter indicies, dont switch to props tab on
 control click

---
 .../frmFormDesigner.Designer.vb               |  2 +-
 app/DD_PM_WINDREAM/frmFormDesigner.resx       |  3 ---
 app/DD_PM_WINDREAM/frmFormDesigner.vb         | 19 +++++++++----------
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
index f62360b..1ec2b91 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb
@@ -400,7 +400,7 @@ Partial Class frmFormDesigner
         '
         'btnrefresh
         '
-        Me.btnrefresh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
+        Me.btnrefresh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
         Me.btnrefresh.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.arrow_refresh
         Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
         Me.btnrefresh.Location = New System.Drawing.Point(828, 514)
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx
index a227075..20ee88e 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.resx
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx
@@ -132,9 +132,6 @@
   <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
   <metadata name="TBPM_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1021, 17</value>
   </metadata>
diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index 539bdd4..109a51b 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -16,8 +16,9 @@ Public Class frmFormDesigner
 
     ' Windream List Data
     Private Windream_ChoiceLists As List(Of String)
-    Private Windream_Indicies As List(Of String)
+    Private Windream_AllIndicies As List(Of String)
     Private Windream_VectorIndicies As List(Of String)
+    Private Windream_SimpleIndicies As List(Of String)
 
 
     Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load
@@ -30,9 +31,10 @@ Public Class frmFormDesigner
                 clsWindream.Create_Session()
 
                 'Windream Abfragen, sollten einmal beim Start des Formulars geladen werden
-                Windream_Indicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
+                Windream_AllIndicies = clsWD_GET.GetIndicesByObjecttype(CURRENT_OBJECTTYPE).ToList()
                 Windream_ChoiceLists = clsWD_GET.GetChoiceLists()
-                Windream_VectorIndicies = Windream_Indicies.FindAll(AddressOf IsVectorIndex)
+                Windream_VectorIndicies = Windream_AllIndicies.FindAll(AddressOf IsVectorIndex)
+                Windream_SimpleIndicies = Windream_AllIndicies.Except(Windream_VectorIndicies).ToList()
             Catch ex As Exception
                 MsgBox("Fehler bei Initialisieren von windream: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:")
             End Try
@@ -475,9 +477,6 @@ Public Class frmFormDesigner
     Private Sub OnControl_MouseUp(sender As Control, e As MouseEventArgs)
         Mouse_IsPressed = False
 
-        ' Ersten Tab anzeigen
-        TabControlEigenschaften.SelectTab(0)
-
         ' Control Eigenschaften laden
         LoadControlProperties(sender)
 
@@ -629,19 +628,19 @@ Public Class frmFormDesigner
             props = labelProps
         ElseIf TypeOf sender Is CheckBox Then
             Dim check As CheckBox = sender
-            Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, row, Windream_Indicies)
+            Dim checkProps As CheckboxProperties = CreatePropsObjectWithIndicies(New CheckboxProperties, row, Windream_AllIndicies)
             checkProps.Text = check.Text
 
             props = checkProps
         ElseIf TypeOf sender Is TextBox Then
             Dim txt As TextBox = sender
-            Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, Windream_Indicies)
+            Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, Windream_AllIndicies)
 
             props = txtProps
 
         ElseIf TypeOf sender Is ComboBox Then
             Dim cmb As ComboBox = sender
-            Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, row, Windream_Indicies)
+            Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, row, Windream_AllIndicies)
             cmbProps.ChoiceLists = Windream_ChoiceLists
             cmbProps.ChoiceList = NotNull(row.Item("CHOICE_LIST"), "")
 
@@ -649,7 +648,7 @@ Public Class frmFormDesigner
 
         ElseIf TypeOf sender Is DateTimePicker Then
             Dim dtp As DateTimePicker = sender
-            Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Windream_Indicies)
+            Dim dtpProps As DatepickerProperties = CreatePropsObjectWithIndicies(New DatepickerProperties, row, Windream_AllIndicies)
 
             props = dtpProps
         ElseIf TypeOf sender Is DataGridView Then

From 86363d46a007a3965dd6edb90ce39ee88df7c33b Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Wed, 4 Apr 2018 11:49:13 +0200
Subject: [PATCH 07/14] dont use IndexType

---
 app/DD_PM_WINDREAM/ModuleControlProperties.vb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/DD_PM_WINDREAM/ModuleControlProperties.vb b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
index 61f51b2..b67ac66 100644
--- a/app/DD_PM_WINDREAM/ModuleControlProperties.vb
+++ b/app/DD_PM_WINDREAM/ModuleControlProperties.vb
@@ -148,6 +148,7 @@ Public Module ModuleControlProperties
             End Set
         End Property
 
+        <Browsable(False)>
         <Category("Indexierung")>
         Public Property IndexType() As IndexTypes
             Get

From 31cb0da1d733fc581fb662d66605ae7c9bcf46a7 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Wed, 4 Apr 2018 11:50:10 +0200
Subject: [PATCH 08/14] jj: don't assign first_control/last_control

---
 app/DD_PM_WINDREAM/frmValidator.Designer.vb |  2 +-
 app/DD_PM_WINDREAM/frmValidator.vb          | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/DD_PM_WINDREAM/frmValidator.Designer.vb b/app/DD_PM_WINDREAM/frmValidator.Designer.vb
index 475869c..3bb4285 100644
--- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb
@@ -709,7 +709,7 @@ Partial Class frmValidator
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
         Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.PdfFilePrintBarItem1, Me.PdfPreviousPageBarItem1, Me.PdfNextPageBarItem1, Me.PdfFindTextBarItem1, Me.PdfZoomOutBarItem1, Me.PdfZoomInBarItem1, Me.PdfExactZoomListBarSubItem1, Me.PdfZoom10CheckItem1, Me.PdfZoom25CheckItem1, Me.PdfZoom50CheckItem1, Me.PdfZoom75CheckItem1, Me.PdfZoom100CheckItem1, Me.PdfZoom125CheckItem1, Me.PdfZoom150CheckItem1, Me.PdfZoom200CheckItem1, Me.PdfZoom400CheckItem1, Me.PdfZoom500CheckItem1, Me.PdfSetActualSizeZoomModeCheckItem1, Me.PdfSetPageLevelZoomModeCheckItem1, Me.PdfSetFitWidthZoomModeCheckItem1, Me.PdfSetFitVisibleZoomModeCheckItem1})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 25
+        Me.RibbonControl1.MaxItemId = 26
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.PdfRibbonPage1})
         Me.RibbonControl1.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonControlStyle.Office2010
diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb
index 0a81502..77353e2 100644
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@@ -457,7 +457,8 @@ Public Class frmValidator
                                         (SERVER=DEDICATED)
                                         (SERVICE_NAME={row.Item("DATENBANK")})
                                     )
-                               );User Id={row.Item("USERNAME")};Password={row.Item("PASSWORD")}
+                                )
+                            );User Id={row.Item("USERNAME")};Password={row.Item("PASSWORD")}
                         """
                     Else
                         csBuilder.DataSource = row.Item("SERVER")
@@ -685,10 +686,12 @@ Public Class frmValidator
                         ctrl = ClassControlCreator.CreateExistingLine(dr, False)
                 End Select
 
-                If first_control Is Nothing Then
-                    first_control = ctrl
+                If TypeOf ctrl IsNot Label Then
+                    If first_control Is Nothing Then
+                        first_control = ctrl
+                    End If
+                    last_control = ctrl
                 End If
-                last_control = ctrl
 
                 pnldesigner.Controls.Add(ctrl)
 

From f7dd16df387b5b9866997ab70e41579986b84548 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 10 Apr 2018 14:53:25 +0200
Subject: [PATCH 09/14] jj: add logs

---
 app/DD_PM_WINDREAM/ClassWindream_allgemein.vb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb
index e3e9c5d..f9ec574 100644
--- a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb
+++ b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb
@@ -56,6 +56,7 @@ Public Class ClassWindream_allgemein
                 Me.oConnect = CreateObject("Windream.WMConnect")
                 'MsgBox("windrem init 'ed")
             Catch ex As Exception
+                If LogErrorsOnly = False Then ClassLogger.Add($"Error while creating WMConnect Object: {vbCrLf}{ex.Message}", False)
                 Return False
             End Try
 
@@ -114,6 +115,7 @@ Public Class ClassWindream_allgemein
 
             End If
 
+            If LogErrorsOnly = False Then ClassLogger.Add($" >> windream login successful", False)
             Return True
 
         Catch ex As Exception

From c47a7fc769c9e3a43c6a29a786152ffc781ebc2e Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 10 Apr 2018 14:54:20 +0200
Subject: [PATCH 10/14] jj: Add default value for Profile -> ADDED_WHEN

---
 app/DD_PM_WINDREAM/frmProfileDesigner.vb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/DD_PM_WINDREAM/frmProfileDesigner.vb b/app/DD_PM_WINDREAM/frmProfileDesigner.vb
index 3cbf288..01e813a 100644
--- a/app/DD_PM_WINDREAM/frmProfileDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmProfileDesigner.vb
@@ -185,6 +185,7 @@ Public Class frmProfileDesigner
 
     Private Sub TBPM_PROFILEBindingSource_AddingNew(sender As Object, e As System.ComponentModel.AddingNewEventArgs) Handles TBPM_PROFILEBindingSource.AddingNew
         DD_DMSLiteDataSet.TBPM_PROFILE.ADDED_WHOColumn.DefaultValue = Environment.UserName
+        DD_DMSLiteDataSet.TBPM_PROFILE.ADDED_WHENColumn.DefaultValue = Date.Now
         DD_DMSLiteDataSet.TBPM_PROFILE.TYPEColumn.DefaultValue = 1
     End Sub
 

From d0b277a04c0f85f6389c16793f0e841304fe3438 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 10 Apr 2018 14:54:49 +0200
Subject: [PATCH 11/14] jj: Add Logging

---
 app/DD_PM_WINDREAM/frmMain.vb | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb
index 7de7212..50094c6 100644
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@@ -733,10 +733,20 @@ Public Class frmMain
 
     Public Sub New()
         Dim splash As New frmSplash()
-        splash.ShowDialog()
+        Try
+            splash.ShowDialog()
+        Catch ex As Exception
+            ClassLogger.Add($"Error in Splash: {ex.Message}")
+        End Try
+        Try
+            InitializeComponent()
+            ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+        Catch ex As Exception
+            ClassLogger.Add($"Error in InitializeComponent: {ex.Message}")
+        End Try
+
         ' Dieser Aufruf ist für den Designer erforderlich.
-        InitializeComponent()
-        ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
+
     End Sub
 
     Private Sub TimerReminder_Tick(sender As Object, e As EventArgs) Handles TimerReminder.Tick

From f8c879e875df6b248135559b601ebbe6187c9843 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 10 Apr 2018 14:58:10 +0200
Subject: [PATCH 12/14] jj: Add Logging

---
 app/DD_PM_WINDREAM/frmFormDesigner.vb | 146 +++++++++++++++-----------
 1 file changed, 82 insertions(+), 64 deletions(-)

diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb
index 109a51b..052ab17 100644
--- a/app/DD_PM_WINDREAM/frmFormDesigner.vb
+++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb
@@ -216,102 +216,107 @@ Public Class frmFormDesigner
 
         Mouse_IsPressed = False
 
-        Select Case e.Data.GetData(DataFormats.Text)
-            Case ClassControlCreator.PREFIX_LABEL
-                Dim label = ClassControlCreator.CreateNewLabel(cursorPosition)
-                SetMovementHandlers(label)
+        Try
+            Select Case e.Data.GetData(DataFormats.Text)
+                Case ClassControlCreator.PREFIX_LABEL
+                    Dim label = ClassControlCreator.CreateNewLabel(cursorPosition)
+                    SetMovementHandlers(label)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, Environment.UserName, label.Size.Height, label.Size.Width)
+                    TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, Environment.UserName, label.Size.Height, label.Size.Width)
 
-                CurrentControl = label
-                CurrentControl.Tag = GetLastID()
+                    CurrentControl = label
+                    CurrentControl.Tag = GetLastID()
 
-                pnldesigner.Controls.Add(label)
+                    pnldesigner.Controls.Add(label)
 
-            Case ClassControlCreator.PREFIX_TEXTBOX
-                Dim txt = ClassControlCreator.CreateNewTextBox(cursorPosition)
-                SetMovementHandlers(txt)
+                Case ClassControlCreator.PREFIX_TEXTBOX
+                    Dim txt = ClassControlCreator.CreateNewTextBox(cursorPosition)
+                    SetMovementHandlers(txt)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, Environment.UserName, txt.Size.Height, txt.Size.Width)
+                    TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, Environment.UserName, txt.Size.Height, txt.Size.Width)
 
-                CurrentControl = txt
-                CurrentControl.Tag = GetLastID()
+                    CurrentControl = txt
+                    CurrentControl.Tag = GetLastID()
 
-                pnldesigner.Controls.Add(txt)
+                    pnldesigner.Controls.Add(txt)
 
-            Case ClassControlCreator.PREFIX_COMBOBOX
-                Dim cmb = ClassControlCreator.CreateNewCombobox(cursorPosition)
-                SetMovementHandlers(cmb)
+                Case ClassControlCreator.PREFIX_COMBOBOX
+                    Dim cmb = ClassControlCreator.CreateNewCombobox(cursorPosition)
+                    SetMovementHandlers(cmb)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, Environment.UserName, cmb.Size.Height, cmb.Size.Width)
+                    TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, Environment.UserName, cmb.Size.Height, cmb.Size.Width)
 
-                CurrentControl = cmb
-                CurrentControl.Tag = GetLastID()
+                    CurrentControl = cmb
+                    CurrentControl.Tag = GetLastID()
 
-                pnldesigner.Controls.Add(cmb)
+                    pnldesigner.Controls.Add(cmb)
 
-            Case ClassControlCreator.PREFIX_DATETIMEPICKER
-                Dim dtp = ClassControlCreator.CreateNewDatetimepicker(cursorPosition)
-                SetMovementHandlers(dtp)
+                Case ClassControlCreator.PREFIX_DATETIMEPICKER
+                    Dim dtp = ClassControlCreator.CreateNewDatetimepicker(cursorPosition)
+                    SetMovementHandlers(dtp)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, Environment.UserName, dtp.Size.Height, dtp.Size.Width)
+                    TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, Environment.UserName, dtp.Size.Height, dtp.Size.Width)
 
-                CurrentControl = dtp
-                CurrentControl.Tag = GetLastID()
+                    CurrentControl = dtp
+                    CurrentControl.Tag = GetLastID()
 
-                pnldesigner.Controls.Add(dtp)
+                    pnldesigner.Controls.Add(dtp)
 
-            Case ClassControlCreator.PREFIX_CHECKBOX
-                Dim chk = ClassControlCreator.CreateNewCheckbox(cursorPosition)
-                SetMovementHandlers(chk)
+                Case ClassControlCreator.PREFIX_CHECKBOX
+                    Dim chk = ClassControlCreator.CreateNewCheckbox(cursorPosition)
+                    SetMovementHandlers(chk)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, Environment.UserName, chk.Size.Height, chk.Size.Width)
+                    TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, Environment.UserName, chk.Size.Height, chk.Size.Width)
 
-                CurrentControl = chk
-                CurrentControl.Tag = GetLastID()
+                    CurrentControl = chk
+                    CurrentControl.Tag = GetLastID()
 
-                pnldesigner.Controls.Add(chk)
+                    pnldesigner.Controls.Add(chk)
 
-            Case ClassControlCreator.PREFIX_DATAGRIDVIEW
-                Dim dgv = ClassControlCreator.CreateNewDatagridview(cursorPosition)
-                SetMovementHandlers(dgv)
+                Case ClassControlCreator.PREFIX_DATAGRIDVIEW
+                    Dim dgv = ClassControlCreator.CreateNewDatagridview(cursorPosition)
+                    SetMovementHandlers(dgv)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dgv.Name, "DGV", dgv.Name, dgv.Location.X, dgv.Location.Y, Environment.UserName, dgv.Size.Height, dgv.Size.Width)
+                    TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dgv.Name, "DGV", dgv.Name, dgv.Location.X, dgv.Location.Y, Environment.UserName, dgv.Size.Height, dgv.Size.Width)
 
-                CurrentControl = dgv
-                CurrentControl.Tag = GetLastID()
+                    CurrentControl = dgv
+                    CurrentControl.Tag = GetLastID()
 
-                pnldesigner.Controls.Add(dgv)
+                    pnldesigner.Controls.Add(dgv)
 
-            Case ClassControlCreator.PREFIX_TABLE
-                Dim tb = ClassControlCreator.CreateNewTable(cursorPosition)
+                Case ClassControlCreator.PREFIX_TABLE
+                    Dim tb = ClassControlCreator.CreateNewTable(cursorPosition)
 
-                SetMovementHandlers(tb)
-                AddHandler tb.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
+                    SetMovementHandlers(tb)
+                    AddHandler tb.ColumnHeaderMouseClick, AddressOf table_ColumnHeaderMouseClick
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, Environment.UserName, tb.Size.Height, tb.Size.Width)
+                    TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, Environment.UserName, tb.Size.Height, tb.Size.Width)
 
-                CurrentControl = tb
-                CurrentControl.Tag = GetLastID()
+                    CurrentControl = tb
+                    CurrentControl.Tag = GetLastID()
 
-                TBPM_CONTROL_TABLETableAdapter.Insert(CurrentControl.Tag, "column1", "Column1", 95, Environment.UserName)
-                TBPM_CONTROL_TABLETableAdapter.Insert(CurrentControl.Tag, "column2", "Column2", 95, Environment.UserName)
+                    TBPM_CONTROL_TABLETableAdapter.Insert(CurrentControl.Tag, "column1", "Column1", 95, Environment.UserName)
+                    TBPM_CONTROL_TABLETableAdapter.Insert(CurrentControl.Tag, "column2", "Column2", 95, Environment.UserName)
 
-                pnldesigner.Controls.Add(tb)
+                    pnldesigner.Controls.Add(tb)
 
-            Case ClassControlCreator.PREFIX_LINE
-                Dim line = ClassControlCreator.CreateNewLine(cursorPosition)
+                Case ClassControlCreator.PREFIX_LINE
+                    Dim line = ClassControlCreator.CreateNewLine(cursorPosition)
 
-                SetMovementHandlers(line)
+                    SetMovementHandlers(line)
 
-                TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, Environment.UserName, line.Size.Height, line.Size.Width)
+                    TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, Environment.UserName, line.Size.Height, line.Size.Width)
 
-                CurrentControl = line
-                CurrentControl.Tag = GetLastID()
+                    CurrentControl = line
+                    CurrentControl.Tag = GetLastID()
 
 
-                pnldesigner.Controls.Add(line)
-        End Select
+                    pnldesigner.Controls.Add(line)
+            End Select
+        Catch ex As Exception
+            ClassLogger.Add($"Error while Adding new control {e.Data.GetData(DataFormats.Text)}:")
+            ClassLogger.Add(ex)
+        End Try
     End Sub
 
     Private Sub pnlDesigner_DragEnter(sender As System.Object, e As DragEventArgs) Handles pnldesigner.DragEnter
@@ -601,11 +606,24 @@ Public Class frmFormDesigner
 
         ' 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
-        TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, ProfileId)
+        Try
+            TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil(DD_DMSLiteDataSet.TBPM_PROFILE_CONTROLS, ProfileId)
+        Catch ex As Exception
+            ClassLogger.Add("Error while executing TBPM_PROFILE_CONTROLSTableAdapter.FillByProfil in LoadControlProperties:")
+            ClassLogger.Add(ex)
+        End Try
 
         row = dt.AsEnumerable().Where(Function(r As DataRow)
                                           Return r.Item("GUID") = sender.Tag
-                                      End Function).Single()
+                                      End Function).SingleOrDefault()
+
+        ' Control-Id wurde nicht in DataRow gefunden
+        If IsNothing(row) Then
+            ClassLogger.Add($"Error while filtering Controls by Guid '{sender.Tag}' in LoadControlProperties:")
+            MsgBox($"Control mit der Id {sender.Tag} wurde nicht gefunden!", MsgBoxStyle.Critical, "Fehler beim Laden der Control Eigenschaften")
+
+            Exit Sub
+        End If
 
         ' Globale Variablen setzen
         CurrentControl = sender
@@ -763,7 +781,7 @@ Public Class frmFormDesigner
             tslblAenderungen.Visible = True
             tslblAenderungen.Text = "Änderungen gespeichert - " & Now
         Catch ex As Exception
-            Dim msg = $"UpdateSingleValue - Fehler beim Speichern von Control (Id: {guid}): {vbCrLf}{ex.Message}"
+            Dim msg = $"UpdateSingleValue - Fehler beim Speichern von Control (Id: {guid}, column: {columnName}): {vbCrLf}{ex.Message}"
             MsgBox(msg)
             ClassLogger.Add(msg)
         End Try

From 0423d460494a4f6fbd212b214ee8d9e9ffa7ded9 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 10 Apr 2018 15:00:05 +0200
Subject: [PATCH 13/14] jj: change reference to Lib_Standards

---
 app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj |  2 +-
 app/Setup/Product.wxs                    | 23 ++++++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
index e23fb6e..2f9462f 100644
--- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
+++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
@@ -58,7 +58,7 @@
   <ItemGroup>
     <Reference Include="DD_LIB_Standards, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\DDLibStandards\DD_LIB_Standards\bin\Debug\DD_LIB_Standards.dll</HintPath>
+      <HintPath>P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll</HintPath>
     </Reference>
     <Reference Include="DevExpress.Charts.v15.2.Core, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Data.v15.2, Version=15.2.16.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
diff --git a/app/Setup/Product.wxs b/app/Setup/Product.wxs
index 03d2635..87cebc2 100644
--- a/app/Setup/Product.wxs
+++ b/app/Setup/Product.wxs
@@ -51,10 +51,20 @@
 
     <DirectoryRef Id="INSTALLDIR">
       <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B">
-        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
+        <!--<File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
           <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
           <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
-        </File>
+        </File>-->
+        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes" />      
+        
+      </Component>
+
+      <Component Id="DesktopShortcut" Guid="a9051d3a-4a83-4597-a616-33977c67e9e8" KeyPath="yes">
+        <Shortcut Id="DesktopShortcut"
+                   Name="$(var.ProductName)"
+                   Target="[#MainApplicationExe]"
+                   WorkingDirectory="INSTALLDIR"
+                  />
       </Component>
 
       <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
@@ -77,6 +87,7 @@
 
       <Component Id="DDLibs" Guid="BA2979E3-3778-48B8-B0D8-4B77825B9293">
         <File Id="DLLLicenseManager" Name="DLLLicenseManager.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DLLLicenseManager.dll" KeyPath="yes"/>
+        <File Id="DDLibStandards" Name="DD_LIB_Standards.dll" Source="P:\Visual Studio Projekte\Bibliotheken\DD_LIB_Standards.dll" />
       </Component>
 
       <Component Id="Oracle" Guid="CF76DB5D-3263-450F-96C6-F02F5447A0A1">
@@ -88,12 +99,17 @@
       </Component>
       
       <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
-        <File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="yes"/>
+        <File Id="DevExpress.Images.v15.2" Name="DevExpress.Images.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Images.v15.2.dll" KeyPath="yes"/>
+        <File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll"/>
         <File Id="DevExpress.Pdf.v15.2.Core" Name="DevExpress.Pdf.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll"/>
         <File Id="DevExpress.Pdf.v15.2.Drawing" Name="DevExpress.Pdf.v15.2.Drawing.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Drawing.dll" />
+        <File Id="DevExpress.Charts.v15.2.Core" Name="DevExpress.Charts.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Charts.v15.2.Core.dll"/>
         <File Id="DevExpress.Printing.v15.2.Core" Name="DevExpress.Printing.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Printing.v15.2.Core.dll"/>
         <File Id="DevExpress.Utils.v15.2" Name="DevExpress.Utils.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Utils.v15.2.dll"/>
         <File Id="DevExpress.XtraBars.v15.2" Name="DevExpress.XtraBars.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraBars.v15.2.dll"/>
+        <File Id="DevExpress.XtraCharts.v15.2" Name="DevExpress.XtraCharts.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.dll"/>
+        <File Id="DevExpress.XtraCharts.v15.2.Wizard" Name="DevExpress.XtraCharts.v15.2.Wizard.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.Wizard.dll"/>
+        <File Id="DevExpress.XtraCharts.v15.2.UI" Name="DevExpress.XtraCharts.v15.2.UI.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraCharts.v15.2.UI.dll"/>
         <File Id="DevExpress.XtraEditors.v15.2" Name="DevExpress.XtraEditors.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraEditors.v15.2.dll"/>
         <File Id="DevExpress.XtraGrid.v15.2" Name="DevExpress.XtraGrid.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraGrid.v15.2.dll"/>
         <File Id="DevExpress.XtraLayout.v15.2" Name="DevExpress.XtraLayout.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.XtraLayout.v15.2.dll"/>
@@ -140,6 +156,7 @@
       <ComponentRef Id="IndependentsoftLibs" />
       <ComponentRef Id="DevExpressLibs" />
       <ComponentRef Id="ProgramMenuDir" />
+      <ComponentRef Id="DesktopShortcut" />
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->

From 2c0d24cdcad814a9a278aaae656b29ad929272f4 Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@didalog.de>
Date: Tue, 10 Apr 2018 15:13:08 +0200
Subject: [PATCH 14/14] jj: Finish Setup Tweaks

---
 app/Setup/Product.wxs | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/app/Setup/Product.wxs b/app/Setup/Product.wxs
index 87cebc2..6cb78c0 100644
--- a/app/Setup/Product.wxs
+++ b/app/Setup/Product.wxs
@@ -50,28 +50,18 @@
     </Directory>
 
     <DirectoryRef Id="INSTALLDIR">
+      
       <Component Id="MainApplicationExe" Guid="71B06048-F595-40CE-B429-79C2F2D6001B">
-        <!--<File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
+        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes">
           <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
           <Shortcut Id="StartMenuShortcut" Directory="ProgramMenuDir" Name="$(var.ProductName)" WorkingDirectory="INSTALLDIR" Icon="AppIcon.exe" IconIndex="0" Advertise="yes" />
-        </File>-->
-        <File Id="MainApplicationExe" Source="..\$(var.ProgramName)\bin\$(var.Configuration)\$(var.ProgramName).exe" Name="$(var.ProgramName).exe" KeyPath="yes" Checksum="yes" />      
-        
+        </File>       
       </Component>
 
-      <Component Id="DesktopShortcut" Guid="a9051d3a-4a83-4597-a616-33977c67e9e8" KeyPath="yes">
-        <Shortcut Id="DesktopShortcut"
-                   Name="$(var.ProductName)"
-                   Target="[#MainApplicationExe]"
-                   WorkingDirectory="INSTALLDIR"
-                  />
-      </Component>
 
       <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
-
         <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD Process Manager\Release_Notes.txt" KeyPath="yes">
         </File>
-
       </Component>
 
       <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
@@ -156,7 +146,6 @@
       <ComponentRef Id="IndependentsoftLibs" />
       <ComponentRef Id="DevExpressLibs" />
       <ComponentRef Id="ProgramMenuDir" />
-      <ComponentRef Id="DesktopShortcut" />
     </Feature>
 
     <!-- Legt das Standard-Installationsverzeichnis fest-->