lots of bugs annihilated/smashed/burned to the ground

app/DD_PM_WINDREAM/ClassControlCreator.vb

@@ -1,5 +1,8 @@
 Imports DD_LIB_Standards
 Imports DevExpress.Utils
+Imports DevExpress.XtraEditors
+Imports DevExpress.XtraEditors.Controls
+Imports DevExpress.XtraEditors.NavigatorButtons
 Imports DevExpress.XtraGrid
 Imports DevExpress.XtraGrid.Views.Grid
 Imports DigitalData.Controls.LookupGrid
@@ -179,6 +182,8 @@ Public Class ClassControlCreator
             .Cursor = Cursors.Hand,
             .Location = location
         }
+        oControl.UseEmbeddedNavigator = True
+        oControl.ForceInitialize()
         Dim oView As GridView = oControl.DefaultView
         oView.OptionsView.ShowGroupPanel = False
 
@@ -236,8 +241,8 @@ Public Class ClassControlCreator
         Return control
     End Function
 
-    Public Shared Function CreateExistingCombobox(row As DataRow, designMode As Boolean) As ComboBox
+    Public Shared Function CreateExistingCombobox(row As DataRow, designMode As Boolean) As Windows.Forms.ComboBox
-        Dim control As ComboBox = CreateBaseControl(New ComboBox(), row, designMode)
+        Dim control As Windows.Forms.ComboBox = CreateBaseControl(New Windows.Forms.ComboBox(), row, designMode)
 
         control.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
 
@@ -321,8 +326,6 @@ Public Class ClassControlCreator
         Dim oDatatable As New DataTable
         Dim oView As GridView
 
-
-
         oControl.ForceInitialize()
 
         oView = oControl.DefaultView
@@ -343,11 +346,27 @@ Public Class ClassControlCreator
 
         oControl.Size = New Size(row.Item("WIDTH"), row.Item("HEIGHT"))
 
+        ' Add and configure navigator to delete rows
+        oControl.UseEmbeddedNavigator = True
+        With oControl.EmbeddedNavigator.Buttons
+            .CancelEdit.Visible = False
+            .Edit.Visible = False
+            .EndEdit.Visible = False
+            .First.Visible = False
+            .Last.Visible = False
+            .Next.Visible = False
+            .NextPage.Visible = False
+            .Append.Visible = False
+            .PrevPage.Visible = False
+            .Prev.Visible = False
+        End With
+
         For Each oRow As DD_DMSLiteDataSet.TBPM_CONTROL_TABLERow In columns
             Dim oColumn = New DataColumn() With {
                 .DataType = GetType(String),
                 .ColumnName = oRow.SPALTENNAME,
-                .Caption = oRow.SPALTEN_HEADER
+                .Caption = oRow.SPALTEN_HEADER,
+                .ReadOnly = False
             }
 
             oDatatable.Columns.Add(oColumn)
@@ -358,6 +377,7 @@ Public Class ClassControlCreator
         Return oControl
     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 = "------------------------------"

app/DD_PM_WINDREAM/DD_DMSLiteDataSet.Designer.vb

@@ -20803,9 +20803,9 @@ Namespace DD_DMSLiteDataSetTableAdapters
             Me._adapter.TableMappings.Add(tableMapping)
             Me._adapter.DeleteCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.DeleteCommand.Connection = Me.Connection
-            Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (CONTROL_ID = @Original_CONTROL_ID)"
+            Me._adapter.DeleteCommand.CommandText = "DELETE FROM TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (GUID = @COLUMNID)"
             Me._adapter.DeleteCommand.CommandType = Global.System.Data.CommandType.Text
-            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@Original_CONTROL_ID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "CONTROL_ID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
+            Me._adapter.DeleteCommand.Parameters.Add(New Global.System.Data.SqlClient.SqlParameter("@COLUMNID", Global.System.Data.SqlDbType.Int, 4, Global.System.Data.ParameterDirection.Input, 0, 0, "GUID", Global.System.Data.DataRowVersion.Original, false, Nothing, "", "", ""))
             Me._adapter.InsertCommand = New Global.System.Data.SqlClient.SqlCommand()
             Me._adapter.InsertCommand.Connection = Me.Connection
             Me._adapter.InsertCommand.CommandText = "INSERT INTO TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"                         (CONTROL_ID, SPALTENNAME"& _ 
@@ -20891,7 +20891,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(4) {}
+            Me._commandCollection = New Global.System.Data.SqlClient.SqlCommand(5) {}
             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"& _ 
@@ -20918,23 +20918,28 @@ 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       *"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"
+            Me._commandCollection(2).CommandText = "DELETE FROM TBPM_CONTROL_TABLE"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"WHERE        (CONTROL_ID = @CONTROL_ID)"
             Me._commandCollection(2).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(2).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.Original, false, Nothing, "", "", ""))
             Me._commandCollection(3) = New Global.System.Data.SqlClient.SqlCommand()
             Me._commandCollection(3).Connection = Me.Connection
-            Me._commandCollection(3).CommandText = "SELECT        GUID, CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE, VALID"& _ 
+            Me._commandCollection(3).CommandText = "SELECT       *"&Global.Microsoft.VisualBasic.ChrW(13)&Global.Microsoft.VisualBasic.ChrW(10)&"FROM            TBPM_CONTROL_TABLE"
+            Me._commandCollection(3).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(4) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(4).Connection = Me.Connection
+            Me._commandCollection(4).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("@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("@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).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(5) = New Global.System.Data.SqlClient.SqlCommand()
+            Me._commandCollection(5).Connection = Me.Connection
+            Me._commandCollection(5).CommandText = "SELECT GUID FROM TBPM_CONTROL_TABLE where Control_ID = @control_id and Spaltennam"& _ 
+                "e = @spaltenname"
+            Me._commandCollection(5).CommandType = Global.System.Data.CommandType.Text
+            Me._commandCollection(5).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(5).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(),  _
@@ -20968,7 +20973,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
          Global.System.ComponentModel.Design.HelpKeywordAttribute("vs.data.TableAdapter"),  _
          Global.System.ComponentModel.DataObjectMethodAttribute(Global.System.ComponentModel.DataObjectMethodType.Fill, false)>  _
         Public Overloads Overridable Function FillAll(ByVal dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable) As Integer
-            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            Me.Adapter.SelectCommand = Me.CommandCollection(3)
             If (Me.ClearBeforeFill = true) Then
                 dataTable.Clear
             End If
@@ -20981,7 +20986,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 GetDataAll() As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable
-            Me.Adapter.SelectCommand = Me.CommandCollection(2)
+            Me.Adapter.SelectCommand = Me.CommandCollection(3)
             Dim dataTable As DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable = New DD_DMSLiteDataSet.TBPM_CONTROL_TABLEDataTable()
             Me.Adapter.Fill(dataTable)
             Return dataTable
@@ -20992,7 +20997,7 @@ Namespace DD_DMSLiteDataSetTableAdapters
          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 = Me.CommandCollection(4)
             Me.Adapter.SelectCommand.Parameters(0).Value = CType(GUID,Integer)
             If (Me.ClearBeforeFill = true) Then
                 dataTable.Clear
@@ -21006,7 +21011,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(3)
+            Me.Adapter.SelectCommand = Me.CommandCollection(4)
             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)
@@ -21045,8 +21050,8 @@ 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.Delete, true)>  _
-        Public Overloads Overridable Function Delete(ByVal Original_CONTROL_ID As Integer) As Integer
+        Public Overloads Overridable Function Delete(ByVal COLUMNID As Integer) As Integer
-            Me.Adapter.DeleteCommand.Parameters(0).Value = CType(Original_CONTROL_ID,Integer)
+            Me.Adapter.DeleteCommand.Parameters(0).Value = CType(COLUMNID,Integer)
             Dim previousConnectionState As Global.System.Data.ConnectionState = Me.Adapter.DeleteCommand.Connection.State
             If ((Me.Adapter.DeleteCommand.Connection.State And Global.System.Data.ConnectionState.Open)  _
                         <> Global.System.Data.ConnectionState.Open) Then
@@ -21331,11 +21336,34 @@ Namespace DD_DMSLiteDataSetTableAdapters
             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.Delete, false)>  _
+        Public Overloads Overridable Function DeleteColumnsByControlId(ByVal CONTROL_ID As Integer) As Integer
+            Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(2)
+            command.Parameters(0).Value = CType(CONTROL_ID,Integer)
+            Dim previousConnectionState As Global.System.Data.ConnectionState = command.Connection.State
+            If ((command.Connection.State And Global.System.Data.ConnectionState.Open)  _
+                        <> Global.System.Data.ConnectionState.Open) Then
+                command.Connection.Open
+            End If
+            Dim returnValue As Integer
+            Try 
+                returnValue = command.ExecuteNonQuery
+            Finally
+                If (previousConnectionState = Global.System.Data.ConnectionState.Closed) Then
+                    command.Connection.Close
+                End If
+            End Try
+            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")>  _
         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(4)
+            Dim command As Global.System.Data.SqlClient.SqlCommand = Me.CommandCollection(5)
             command.Parameters(0).Value = CType(control_id,Integer)
             If (spaltenname Is Nothing) Then
                 Throw New Global.System.ArgumentNullException("spaltenname")

app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xsd

@@ -1774,9 +1774,9 @@ ORDER BY Y_LOC, X_LOC</CommandText>
                 <DeleteCommand>
                   <DbCommand CommandType="Text" ModifiedByUser="true">
                     <CommandText>DELETE FROM TBPM_CONTROL_TABLE
-WHERE        (CONTROL_ID = @Original_CONTROL_ID)</CommandText>
+WHERE        (GUID = @COLUMNID)</CommandText>
                     <Parameters>
-                      <Parameter AllowDbNull="false" AutogeneratedName="Original_CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="DD_DMS.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@Original_CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                      <Parameter AllowDbNull="false" AutogeneratedName="COLUMNID" ColumnName="GUID" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@COLUMNID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="GUID" SourceColumnNullMapping="false" SourceVersion="Original" />
                     </Parameters>
                   </DbCommand>
                 </DeleteCommand>
@@ -1910,6 +1910,17 @@ WHERE        (GUID = @Original_GUID)</CommandText>
                   </DbCommand>
                 </UpdateCommand>
               </DbSource>
+              <DbSource ConnectionRef="ConnectionString (MySettings)" DbObjectName="" DbObjectType="Unknown" GenerateShortCommands="true" GeneratorSourceName="DeleteColumnsByControlId" Modifier="Public" Name="DeleteColumnsByControlId" QueryType="NoData" ScalarCallRetval="System.Object, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" UseOptimisticConcurrency="true" UserGetMethodName="GetDataBy2" UserSourceName="DeleteColumnsByControlId">
+                <DeleteCommand>
+                  <DbCommand CommandType="Text" ModifiedByUser="true">
+                    <CommandText>DELETE FROM TBPM_CONTROL_TABLE
+WHERE        (CONTROL_ID = @CONTROL_ID)</CommandText>
+                    <Parameters>
+                      <Parameter AllowDbNull="false" AutogeneratedName="CONTROL_ID" ColumnName="CONTROL_ID" DataSourceName="DD_ECM_TEST.dbo.TBPM_CONTROL_TABLE" DataTypeServer="int" DbType="Int32" Direction="Input" ParameterName="@CONTROL_ID" Precision="0" ProviderType="Int" Scale="0" Size="4" SourceColumn="CONTROL_ID" SourceColumnNullMapping="false" SourceVersion="Original" />
+                    </Parameters>
+                  </DbCommand>
+                </DeleteCommand>
+              </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">

app/DD_PM_WINDREAM/DD_DMSLiteDataSet.xss

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

app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb

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

app/DD_PM_WINDREAM/frmControl_Detail.Designer.vb

@@ -49,6 +49,7 @@ Partial Class frmControl_Detail
         Me.CHANGED_WHENTextBox = New System.Windows.Forms.TextBox()
         Me.StatusStrip1 = New System.Windows.Forms.StatusStrip()
         Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel()
+        Me.btnDelete = New System.Windows.Forms.Button()
         SPALTENNAMELabel = New System.Windows.Forms.Label()
         SPALTEN_HEADERLabel = New System.Windows.Forms.Label()
         SPALTENBREITELabel = New System.Windows.Forms.Label()
@@ -218,6 +219,13 @@ Partial Class frmControl_Detail
         Me.tslblAenderungen.Name = "tslblAenderungen"
         resources.ApplyResources(Me.tslblAenderungen, "tslblAenderungen")
         '
+        'btnDelete
+        '
+        Me.btnDelete.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.cancel
+        resources.ApplyResources(Me.btnDelete, "btnDelete")
+        Me.btnDelete.Name = "btnDelete"
+        Me.btnDelete.UseVisualStyleBackColor = True
+        '
         'frmControl_Detail
         '
         resources.ApplyResources(Me, "$this")
@@ -231,6 +239,7 @@ Partial Class frmControl_Detail
         Me.Controls.Add(Me.ADDED_WHENTextBox)
         Me.Controls.Add(ADDED_WHOLabel)
         Me.Controls.Add(Me.ADDED_WHOTextBox)
+        Me.Controls.Add(Me.btnDelete)
         Me.Controls.Add(Me.btnSave)
         Me.Controls.Add(Me.LOAD_IDX_VALUECheckBox)
         Me.Controls.Add(Me.READ_ONLYCheckBox)
@@ -271,4 +280,5 @@ End Sub
     Friend WithEvents CHANGED_WHENTextBox As System.Windows.Forms.TextBox
     Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip
     Friend WithEvents tslblAenderungen As System.Windows.Forms.ToolStripStatusLabel
+    Friend WithEvents btnDelete As Button
 End Class

app/DD_PM_WINDREAM/frmControl_Detail.resx

@@ -147,7 +147,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SPALTENNAMELabel.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>19</value>
   </data>
   <metadata name="SPALTEN_HEADERLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -177,7 +177,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SPALTEN_HEADERLabel.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>17</value>
   </data>
   <metadata name="SPALTENBREITELabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -207,7 +207,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SPALTENBREITELabel.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>15</value>
   </data>
   <metadata name="GUIDLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -237,7 +237,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;GUIDLabel.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>13</value>
   </data>
   <metadata name="ADDED_WHOLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -246,7 +246,7 @@
     <value>True</value>
   </data>
   <data name="ADDED_WHOLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>11, 213</value>
+    <value>11, 263</value>
   </data>
   <data name="ADDED_WHOLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>67, 13</value>
@@ -276,7 +276,7 @@
     <value>True</value>
   </data>
   <data name="ADDED_WHENLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>164, 213</value>
+    <value>164, 263</value>
   </data>
   <data name="ADDED_WHENLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>77, 13</value>
@@ -306,7 +306,7 @@
     <value>True</value>
   </data>
   <data name="CHANGED_WHOLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 254</value>
+    <value>12, 304</value>
   </data>
   <data name="CHANGED_WHOLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>80, 13</value>
@@ -336,7 +336,7 @@
     <value>True</value>
   </data>
   <data name="CHANGED_WHENLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>164, 254</value>
+    <value>164, 304</value>
   </data>
   <data name="CHANGED_WHENLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>90, 13</value>
@@ -390,7 +390,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SPALTENNAMETextBox.ZOrder" xml:space="preserve">
-    <value>19</value>
+    <value>20</value>
   </data>
   <data name="SPALTEN_HEADERTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>15, 108</value>
@@ -411,7 +411,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SPALTEN_HEADERTextBox.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>18</value>
   </data>
   <data name="SPALTENBREITETextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>15, 149</value>
@@ -432,7 +432,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;SPALTENBREITETextBox.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>16</value>
   </data>
   <data name="GUIDTextBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>15, 25</value>
@@ -453,7 +453,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;GUIDTextBox.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>14</value>
   </data>
   <data name="READ_ONLYCheckBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>15, 177</value>
@@ -477,7 +477,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;READ_ONLYCheckBox.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>12</value>
   </data>
   <data name="LOAD_IDX_VALUECheckBox.Location" type="System.Drawing.Point, System.Drawing">
     <value>108, 177</value>
@@ -501,16 +501,16 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;LOAD_IDX_VALUECheckBox.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>11</value>
   </data>
   <data name="btnSave.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
     <value>MiddleLeft</value>
   </data>
   <data name="btnSave.Location" type="System.Drawing.Point, System.Drawing">
-    <value>240, 169</value>
+    <value>167, 228</value>
   </data>
   <data name="btnSave.Size" type="System.Drawing.Size, System.Drawing">
-    <value>86, 32</value>
+    <value>159, 32</value>
   </data>
   <data name="btnSave.TabIndex" type="System.Int32, mscorlib">
     <value>12</value>
@@ -531,10 +531,10 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;btnSave.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>10</value>
   </data>
   <data name="ADDED_WHOTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>14, 229</value>
+    <value>14, 279</value>
   </data>
   <data name="ADDED_WHOTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>147, 22</value>
@@ -555,7 +555,7 @@
     <value>8</value>
   </data>
   <data name="ADDED_WHENTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>167, 229</value>
+    <value>167, 279</value>
   </data>
   <data name="ADDED_WHENTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>159, 22</value>
@@ -576,7 +576,7 @@
     <value>6</value>
   </data>
   <data name="CHANGED_WHOTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>15, 270</value>
+    <value>15, 320</value>
   </data>
   <data name="CHANGED_WHOTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>146, 22</value>
@@ -597,7 +597,7 @@
     <value>4</value>
   </data>
   <data name="CHANGED_WHENTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>167, 270</value>
+    <value>167, 320</value>
   </data>
   <data name="CHANGED_WHENTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>159, 22</value>
@@ -630,10 +630,10 @@
     <value>False</value>
   </data>
   <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 309</value>
+    <value>0, 353</value>
   </data>
   <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>346, 22</value>
+    <value>342, 22</value>
   </data>
   <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -653,6 +653,40 @@
   <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="btnDelete.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnDelete.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnDelete.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 228</value>
+  </data>
+  <data name="btnDelete.Size" type="System.Drawing.Size, System.Drawing">
+    <value>149, 32</value>
+  </data>
+  <data name="btnDelete.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
+  <data name="btnDelete.Text" xml:space="preserve">
+    <value>Löschen</value>
+  </data>
+  <data name="btnDelete.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
+  <data name="&gt;&gt;btnDelete.Name" xml:space="preserve">
+    <value>btnDelete</value>
+  </data>
+  <data name="&gt;&gt;btnDelete.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnDelete.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnDelete.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -660,7 +694,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>346, 331</value>
+    <value>342, 375</value>
   </data>
   <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 8.25pt</value>

app/DD_PM_WINDREAM/frmControl_Detail.vb

@@ -37,6 +37,18 @@ Public Class frmControl_Detail
 
     End Sub
 
+    Private Sub btnDelete_Click(sender As Object, e As EventArgs) Handles btnDelete.Click
+        Try
+            If MessageBox.Show("Wollen Sie diese Spalte wirklich löschen?", "Spalte löschen", MessageBoxButtons.YesNo) = DialogResult.Yes Then
+                TBPM_CONTROL_TABLETableAdapter.Delete(GUIDTextBox.Text)
+                Close()
+            End If
+        Catch ex As Exception
+            LOGGER.Error(ex)
+            MsgBox(ex.Message, MsgBoxStyle.Critical, "Fehler beim Löschen:")
+        End Try
+    End Sub
+
     Private Sub frmControl_Detail_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing
         My.Settings.frmTableColumns_Position = Me.Location
     End Sub
@@ -55,4 +67,6 @@ Public Class frmControl_Detail
         End Try
        
     End Sub
+
+
 End Class

app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb

@@ -61,6 +61,8 @@ 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()
+        Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem()
         Me.GroupBox1.SuspendLayout()
         Me.pnldesigner.SuspendLayout()
         Me.TabControlEigenschaften.SuspendLayout()
@@ -72,6 +74,7 @@ Partial Class frmFormDesigner
         Me.StatusStrip1.SuspendLayout()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.GridControlContextMenu.SuspendLayout()
         Me.SuspendLayout()
         '
         'GroupBox1
@@ -453,6 +456,18 @@ Partial Class frmFormDesigner
         '
         Me.TBPM_CONTROL_TABLETableAdapter.ClearBeforeFill = True
         '
+        'GridControlContextMenu
+        '
+        Me.GridControlContextMenu.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.MenuItemAddColumn})
+        Me.GridControlContextMenu.Name = "ContextMenuStrip1"
+        Me.GridControlContextMenu.Size = New System.Drawing.Size(181, 48)
+        '
+        'MenuItemAddColumn
+        '
+        Me.MenuItemAddColumn.Name = "MenuItemAddColumn"
+        Me.MenuItemAddColumn.Size = New System.Drawing.Size(180, 22)
+        Me.MenuItemAddColumn.Text = "Spalte hinzufügen"
+        '
         'frmFormDesigner
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
@@ -485,6 +500,7 @@ Partial Class frmFormDesigner
         Me.StatusStrip1.PerformLayout()
         CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.GridControlContextMenu.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -526,4 +542,6 @@ Partial Class frmFormDesigner
     Friend WithEvents pageProperties As TabPage
     Friend WithEvents pgControls As PropertyGrid
     Friend WithEvents btnLine As Button
+    Friend WithEvents GridControlContextMenu As ContextMenuStrip
+    Friend WithEvents MenuItemAddColumn As ToolStripMenuItem
 End Class

app/DD_PM_WINDREAM/frmFormDesigner.resx

@@ -127,43 +127,49 @@
 </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>
+    <value>368, 17</value>
   </metadata>
   <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
+    <value>206, 17</value>
+  </metadata>
+  <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>206, 17</value>
   </metadata>
   <metadata name="TBDD_CONNECTIONBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1021, 17</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>
-  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>731, 17</value>
-  </metadata>
-  <metadata name="TBDD_CONNECTIONTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 56</value>
   </metadata>
+  <metadata name="StatusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1093, 17</value>
+  </metadata>
+  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1141, 56</value>
+  </metadata>
+  <metadata name="TBPM_PROFILE_CONTROLSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>647, 17</value>
+  </metadata>
+  <metadata name="TableAdapterManager.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>920, 17</value>
+  </metadata>
+  <metadata name="TBDD_CONNECTIONTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>261, 56</value>
+  </metadata>
   <metadata name="TBWH_CHECK_PROFILE_CONTROLSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>256, 56</value>
+    <value>499, 56</value>
   </metadata>
   <metadata name="TBWH_CHECK_PROFILE_CONTROLSTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>580, 56</value>
+    <value>823, 56</value>
   </metadata>
   <metadata name="TBPM_CONTROL_TABLEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>997, 56</value>
-  </metadata>
-  <metadata name="TBPM_CONTROL_TABLETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 95</value>
   </metadata>
+  <metadata name="TBPM_CONTROL_TABLETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>278, 95</value>
+  </metadata>
+  <metadata name="GridControlContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>25</value>
+    <value>213</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

app/DD_PM_WINDREAM/frmFormDesigner.vb

@@ -27,6 +27,8 @@ Public Class frmFormDesigner
     Private Windream_SimpleIndicies As List(Of String)
     Private Windream_LookupIndicies As List(Of String)
 
+    Private CurrentColumnId As Integer = 0
+
 
     Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load
         Try
@@ -361,7 +363,6 @@ Public Class frmFormDesigner
 
                     SetMovementHandlers(tb)
                     AddHandler tb.MouseClick, AddressOf gridControl_MouseClick
-                    '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)
 
@@ -441,7 +442,7 @@ Public Class frmFormDesigner
             CurrentControl = sender
             CURRENT_CONTROL_ID = sender.Tag
 
-            If oHitinfo.InColumn Then
+            If oHitinfo.IsValid And oHitinfo.InColumn Then
                 Dim oColumn As GridColumn = oHitinfo.Column
 
                 If oColumn Is Nothing Then
@@ -452,10 +453,17 @@ Public Class frmFormDesigner
                 Dim oColumnName As String = oColumn.FieldName
                 Dim oColumnId = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, oColumnName)
 
+                CurrentColumnId = oColumnId
+
                 Dim frmTableColumn = New frmControl_Detail()
-                frmTableColumn.FillData(oColumnId)
+                frmTableColumn.FillData(CurrentColumnId)
                 frmTableColumn.Text = "Konfiguration von Spalte: " & oColumnCaption
-                frmTableColumn.Show()
+                Dim oResult = frmTableColumn.ShowDialog()
+
+                LoadControls()
+
+            ElseIf oHitinfo.IsValid And e.Button = MouseButtons.Right Then
+                GridControlContextMenu.Show(Cursor.Position.X, Cursor.Position.Y)
             End If
         Catch ex As Exception
             LOGGER.Error(ex)
@@ -463,26 +471,6 @@ Public Class frmFormDesigner
         End Try
     End Sub
 
-    Public Sub table_ColumnHeaderMouseClick(sender As System.Object, e As DataGridViewCellMouseEventArgs)
-        Try
-            CurrentControl = sender
-            Dim dgv As DataGridView = sender
-
-            CurrentControl = dgv
-            CURRENT_CONTROL_ID = dgv.Tag
-
-            Dim dgvColumn As DataGridViewColumn = dgv.Columns(e.ColumnIndex)
-            Dim columnId = TBPM_CONTROL_TABLETableAdapter.getColumnID(CURRENT_CONTROL_ID, dgvColumn.Name)
-            Dim frmTableColumn = New frmControl_Detail()
-
-            frmTableColumn.FillData(columnId)
-            frmTableColumn.Text = "Konfiguration von Spalte: " & dgvColumn.Name
-            frmTableColumn.Show()
-        Catch ex As Exception
-            LOGGER.Error(ex)
-            MsgBox("Error while loading Column Configuration: " & vbCrLf & ex.Message, MsgBoxStyle.Critical)
-        End Try
-    End Sub
 
     Sub DeleteControl(controlName As String)
         Try
@@ -491,7 +479,7 @@ Public Class frmFormDesigner
             If result = MsgBoxResult.Yes Then
                 Dim controlId As Integer = TBPM_PROFILE_CONTROLSTableAdapter.cmdGetGUID(ProfileId, controlName)
                 If controlId > 0 Then
-                    Me.TBPM_CONTROL_TABLETableAdapter.Delete(controlId)
+                    TBPM_CONTROL_TABLETableAdapter.DeleteColumnsByControlId(controlId)
                     TBPM_PROFILE_CONTROLSTableAdapter.Delete(controlId)
                     LoadControls()
                 End If
@@ -934,4 +922,22 @@ Public Class frmFormDesigner
             LOGGER.Info(msg)
         End Try
     End Sub
+
+    Private Sub MenuItemAddColumn_Click(sender As Object, e As EventArgs) Handles MenuItemAddColumn.Click
+        Try
+            Dim oGuid = clsTools.ShortGuid()
+            Dim oColumnName As String = "colNew" & oGuid
+            Dim oColumnCaption As String = "New Column " & oGuid
+            If ClassDatabase.Execute_non_Query($"INSERT INTO TBPM_CONTROL_TABLE (CONTROL_ID, SPALTENNAME, SPALTEN_HEADER, SPALTENBREITE) VALUES({CURRENT_CONTROL_ID}, '{oColumnName}', '{oColumnCaption}', 95)", True) = True Then
+                tslblAenderungen.Visible = True
+                tslblAenderungen.Text = "Änderungen gespeichert - " & Now
+
+                LoadControls()
+            End If
+        Catch ex As Exception
+            Dim msg = $"MenuItemAddColumn_Click - Fehler beim Hinzufügen von einer neuen Spalte: {vbCrLf}{ex.Message}"
+            MsgBox(msg)
+            LOGGER.Error(ex)
+        End Try
+    End Sub
 End Class

app/DD_PM_WINDREAM/frmValidator.Designer.vb

@@ -241,8 +241,8 @@ Partial Class frmValidator
         '
         'RefreshAdditionalSearchToolStripMenuItem
         '
-        Me.RefreshAdditionalSearchToolStripMenuItem.Name = "RefreshAdditionalSearchToolStripMenuItem"
         resources.ApplyResources(Me.RefreshAdditionalSearchToolStripMenuItem, "RefreshAdditionalSearchToolStripMenuItem")
+        Me.RefreshAdditionalSearchToolStripMenuItem.Name = "RefreshAdditionalSearchToolStripMenuItem"
         '
         'TITLELabel1
         '
@@ -284,6 +284,7 @@ Partial Class frmValidator
         Me.TableAdapterManager.TBPM_KONFIGURATIONTableAdapter = Me.TBPM_KONFIGURATIONTableAdapter
         Me.TableAdapterManager.TBPM_PROFILE_CONTROLSTableAdapter = Me.TBPM_PROFILE_CONTROLSTableAdapter
         Me.TableAdapterManager.TBPM_PROFILE_FILESTableAdapter = Me.TBPM_PROFILE_FILESTableAdapter
+        Me.TableAdapterManager.TBPM_PROFILE_FINAL_INDEXINGTableAdapter = Nothing
         Me.TableAdapterManager.TBPM_PROFILETableAdapter = Me.TBPM_PROFILETableAdapter
         Me.TableAdapterManager.TBPM_TYPETableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete

app/DD_PM_WINDREAM/frmValidator.resx

@@ -130,6 +130,31 @@
     <value>608, 17</value>
   </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="tstrplblError.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9pt, style=Bold</value>
+  </data>
+  <data name="tstrplblError.Size" type="System.Drawing.Size, System.Drawing">
+    <value>22, 17</value>
+  </data>
+  <data name="tstrplblError.Text" xml:space="preserve">
+    <value>sss</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="tstrplblError.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="tstrlbl_Info.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 17</value>
+  </data>
+  <data name="tstrlbl_Info.Text" xml:space="preserve">
+    <value>Anzahl Dateien:</value>
+  </data>
+  <data name="tsslblDocID.Size" type="System.Drawing.Size, System.Drawing">
+    <value>82, 17</value>
+  </data>
+  <data name="tsslblDocID.Text" xml:space="preserve">
+    <value>Document-ID:</value>
+  </data>
   <data name="StatusStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 621</value>
   </data>
@@ -140,7 +165,6 @@
   <data name="StatusStrip1.Size" type="System.Drawing.Size, System.Drawing">
     <value>962, 22</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="StatusStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
@@ -159,35 +183,48 @@
   <data name="&gt;&gt;StatusStrip1.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="tstrplblError.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9pt, style=Bold</value>
-  </data>
-  <data name="tstrplblError.Size" type="System.Drawing.Size, System.Drawing">
-    <value>22, 17</value>
-  </data>
-  <data name="tstrplblError.Text" xml:space="preserve">
-    <value>sss</value>
-  </data>
-  <data name="tstrplblError.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="tstrlbl_Info.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 17</value>
-  </data>
-  <data name="tstrlbl_Info.Text" xml:space="preserve">
-    <value>Anzahl Dateien:</value>
-  </data>
-  <data name="tsslblDocID.Size" type="System.Drawing.Size, System.Drawing">
-    <value>82, 17</value>
-  </data>
-  <data name="tsslblDocID.Text" xml:space="preserve">
-    <value>Document-ID:</value>
-  </data>
   <metadata name="ContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>790, 173</value>
   </metadata>
+  <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>206, 22</value>
+  </data>
+  <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Datei öffnen</value>
+  </data>
+  <data name="DateiInfoToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>206, 22</value>
+  </data>
+  <data name="DateiInfoToolStripMenuItem.Text" xml:space="preserve">
+    <value>Datei-Info</value>
+  </data>
+  <data name="DateieigenschaftenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        xAAADsQBlSsOGwAAANlJREFUOE+lkrsRgzAQRCmBEijBNZDTgwNqIacCQkIHFEAJJBRATkBGer6nQTYS
+        4mffzBv9dhchKRKRvwhO3uHb8Wqe50R5KbKCcbJI9gNUFCtTWZaSpqkhyzIZx5GQSXmgOwqofHPf985O
+        0B0FfMxgzbSE0Ud3OaAoChmGwZgZs64kwQBd4P+dALBmYB3tJmAxd03TOOY1nI1qtmdww8wtmKv0A1rf
+        zFjn11RK+B1wSAFzp8SLflNOAF/I89yY67o+NVN+wJMQdqJte2amnABbV4y2nIDfkOgNgPkt6Gl+jn4A
+        AAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="DateieigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>206, 22</value>
+  </data>
+  <data name="DateieigenschaftenToolStripMenuItem.Text" xml:space="preserve">
+    <value>Dateieigenschaften</value>
+  </data>
+  <data name="RefreshAdditionalSearchToolStripMenuItem.Enabled" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="RefreshAdditionalSearchToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
+    <value>206, 22</value>
+  </data>
+  <data name="RefreshAdditionalSearchToolStripMenuItem.Text" xml:space="preserve">
+    <value>Refresh AdditionalSearch</value>
+  </data>
   <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>207, 92</value>
+    <value>207, 114</value>
   </data>
   <data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve">
     <value>ContextMenuStrip1</value>
@@ -351,40 +388,6 @@
   <data name="&gt;&gt;Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="DateiÖffnenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>206, 22</value>
-  </data>
-  <data name="DateiÖffnenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Datei öffnen</value>
-  </data>
-  <data name="DateiInfoToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>206, 22</value>
-  </data>
-  <data name="DateiInfoToolStripMenuItem.Text" xml:space="preserve">
-    <value>Datei-Info</value>
-  </data>
-  <data name="DateieigenschaftenToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        xAAADsQBlSsOGwAAANlJREFUOE+lkrsRgzAQRCmBEijBNZDTgwNqIacCQkIHFEAJJBRATkBGer6nQTYS
-        4mffzBv9dhchKRKRvwhO3uHb8Wqe50R5KbKCcbJI9gNUFCtTWZaSpqkhyzIZx5GQSXmgOwqofHPf985O
-        0B0FfMxgzbSE0Ud3OaAoChmGwZgZs64kwQBd4P+dALBmYB3tJmAxd03TOOY1nI1qtmdww8wtmKv0A1rf
-        zFjn11RK+B1wSAFzp8SLflNOAF/I89yY67o+NVN+wJMQdqJte2amnABbV4y2nIDfkOgNgPkt6Gl+jn4A
-        AAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="DateieigenschaftenToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>206, 22</value>
-  </data>
-  <data name="DateieigenschaftenToolStripMenuItem.Text" xml:space="preserve">
-    <value>Dateieigenschaften</value>
-  </data>
-  <data name="RefreshAdditionalSearchToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>206, 22</value>
-  </data>
-  <data name="RefreshAdditionalSearchToolStripMenuItem.Text" xml:space="preserve">
-    <value>Refresh AdditionalSearch</value>
-  </data>
   <metadata name="DD_DMSLiteDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>725, 17</value>
   </metadata>
@@ -553,6 +556,33 @@
   <data name="ToolStrip1.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
+  <data name="ToolStripButtonJumpFile.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="ToolStripButtonJumpFile.Size" type="System.Drawing.Size, System.Drawing">
+    <value>165, 22</value>
+  </data>
+  <data name="ToolStripButtonJumpFile.Text" xml:space="preserve">
+    <value>Datei überspringen (F4)</value>
+  </data>
+  <data name="ToolStripButtonDeleteFile.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="ToolStripButtonDeleteFile.Size" type="System.Drawing.Size, System.Drawing">
+    <value>106, 22</value>
+  </data>
+  <data name="ToolStripButtonDeleteFile.Text" xml:space="preserve">
+    <value>Datei löschen</value>
+  </data>
+  <data name="ToolStripButtonAnnotation.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="ToolStripButtonAnnotation.Size" type="System.Drawing.Size, System.Drawing">
+    <value>105, 22</value>
+  </data>
+  <data name="ToolStripButtonAnnotation.Text" xml:space="preserve">
+    <value>Annotationen</value>
+  </data>
   <data name="ToolStrip1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
@@ -595,9 +625,21 @@
   <data name="&gt;&gt;SplitContainer1.Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <metadata name="StatusStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <data name="WebBrowser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>165, 212</value>
+    <value>Fill</value>
-  </metadata>
+  </data>
+  <data name="WebBrowser.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 21</value>
+  </data>
+  <data name="WebBrowser.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>20, 20</value>
+  </data>
+  <data name="WebBrowser.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 54</value>
+  </data>
+  <data name="WebBrowser.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
   <data name="&gt;&gt;WebBrowser.Name" xml:space="preserve">
     <value>WebBrowser</value>
   </data>
@@ -610,6 +652,27 @@
   <data name="&gt;&gt;WebBrowser.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <metadata name="StatusStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>165, 212</value>
+  </metadata>
+  <data name="tslblWebbrowser.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 17</value>
+  </data>
+  <data name="tslblWebbrowser.Text" xml:space="preserve">
+    <value>ToolStripStatusLabel1</value>
+  </data>
+  <data name="StatusStrip3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 75</value>
+  </data>
+  <data name="StatusStrip3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 22</value>
+  </data>
+  <data name="StatusStrip3.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="StatusStrip3.Text" xml:space="preserve">
+    <value>StatusStrip3</value>
+  </data>
   <data name="&gt;&gt;StatusStrip3.Name" xml:space="preserve">
     <value>StatusStrip3</value>
   </data>
@@ -646,6 +709,21 @@
   <data name="&gt;&gt;grpbxMailBody.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="txtBetreff.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="txtBetreff.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9.75pt, style=Italic</value>
+  </data>
+  <data name="txtBetreff.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 21</value>
+  </data>
+  <data name="txtBetreff.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 25</value>
+  </data>
+  <data name="txtBetreff.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
   <data name="&gt;&gt;txtBetreff.Name" xml:space="preserve">
     <value>txtBetreff</value>
   </data>
@@ -1797,6 +1875,24 @@
   <metadata name="StatusStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>947, 173</value>
   </metadata>
+  <data name="pdfstatuslblPageNumber.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI Semibold, 9pt, style=Bold, Italic</value>
+  </data>
+  <data name="pdfstatuslblPageNumber.Size" type="System.Drawing.Size, System.Drawing">
+    <value>139, 16</value>
+  </data>
+  <data name="pdfstatuslblPageNumber.Text" xml:space="preserve">
+    <value>ToolStripStatusLabel1</value>
+  </data>
+  <data name="ToolStripDropDownButton1.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="ToolStripDropDownButton1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>153, 20</value>
+  </data>
+  <data name="ToolStripDropDownButton1.Text" xml:space="preserve">
+    <value>Seitenansicht Minimal</value>
+  </data>
   <data name="StatusStrip2.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 340</value>
   </data>
@@ -1866,144 +1962,12 @@
   <data name="&gt;&gt;pnlpdf.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="pdfstatuslblPageNumber.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI Semibold, 9pt, style=Bold, Italic</value>
-  </data>
-  <data name="pdfstatuslblPageNumber.Size" type="System.Drawing.Size, System.Drawing">
-    <value>139, 16</value>
-  </data>
-  <data name="pdfstatuslblPageNumber.Text" xml:space="preserve">
-    <value>ToolStripStatusLabel1</value>
-  </data>
-  <data name="ToolStripDropDownButton1.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="ToolStripDropDownButton1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 20</value>
-  </data>
-  <data name="ToolStripDropDownButton1.Text" xml:space="preserve">
-    <value>Seitenansicht Minimal</value>
-  </data>
   <metadata name="PdfBarController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>1064, 173</value>
   </metadata>
   <metadata name="PdfBarController2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 212</value>
   </metadata>
-  <data name="WebBrowser.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="WebBrowser.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 21</value>
-  </data>
-  <data name="WebBrowser.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>20, 20</value>
-  </data>
-  <data name="WebBrowser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 54</value>
-  </data>
-  <data name="WebBrowser.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;WebBrowser.Name" xml:space="preserve">
-    <value>WebBrowser</value>
-  </data>
-  <data name="&gt;&gt;WebBrowser.Type" xml:space="preserve">
-    <value>System.Windows.Forms.WebBrowser, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;WebBrowser.Parent" xml:space="preserve">
-    <value>grpbxMailBody</value>
-  </data>
-  <data name="&gt;&gt;WebBrowser.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <metadata name="StatusStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>165, 212</value>
-  </metadata>
-  <data name="StatusStrip3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 75</value>
-  </data>
-  <data name="StatusStrip3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 22</value>
-  </data>
-  <data name="StatusStrip3.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="StatusStrip3.Text" xml:space="preserve">
-    <value>StatusStrip3</value>
-  </data>
-  <data name="&gt;&gt;StatusStrip3.Name" xml:space="preserve">
-    <value>StatusStrip3</value>
-  </data>
-  <data name="&gt;&gt;StatusStrip3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.StatusStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;StatusStrip3.Parent" xml:space="preserve">
-    <value>grpbxMailBody</value>
-  </data>
-  <data name="&gt;&gt;StatusStrip3.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="tslblWebbrowser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 17</value>
-  </data>
-  <data name="tslblWebbrowser.Text" xml:space="preserve">
-    <value>ToolStripStatusLabel1</value>
-  </data>
-  <data name="txtBetreff.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtBetreff.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt, style=Italic</value>
-  </data>
-  <data name="txtBetreff.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 21</value>
-  </data>
-  <data name="txtBetreff.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 25</value>
-  </data>
-  <data name="txtBetreff.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;txtBetreff.Name" xml:space="preserve">
-    <value>txtBetreff</value>
-  </data>
-  <data name="&gt;&gt;txtBetreff.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtBetreff.Parent" xml:space="preserve">
-    <value>grpBetreff</value>
-  </data>
-  <data name="&gt;&gt;txtBetreff.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="ToolStripButtonJumpFile.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="ToolStripButtonJumpFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 22</value>
-  </data>
-  <data name="ToolStripButtonJumpFile.Text" xml:space="preserve">
-    <value>Datei überspringen (F4)</value>
-  </data>
-  <data name="ToolStripButtonDeleteFile.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="ToolStripButtonDeleteFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>106, 22</value>
-  </data>
-  <data name="ToolStripButtonDeleteFile.Text" xml:space="preserve">
-    <value>Datei löschen</value>
-  </data>
-  <data name="ToolStripButtonAnnotation.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="ToolStripButtonAnnotation.Size" type="System.Drawing.Size, System.Drawing">
-    <value>105, 22</value>
-  </data>
-  <data name="ToolStripButtonAnnotation.Text" xml:space="preserve">
-    <value>Annotationen</value>
-  </data>
   <metadata name="FinalIndexDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>389, 212</value>
   </metadata>

app/DD_PM_WINDREAM/frmValidator.vb

@@ -286,10 +286,6 @@ LOGGER.Error(ex)
         Try
             WINDREAM = New ClassPMWindream()
             WINDREAM.Create_Session()
-            '_windreamPM = New ClassPMWindream()
-            '_windreamPM.Create_Session()
-            '_windream = New ClassWindream_allgemein
-            '_windream.Create_Session()
             LOGGER.Debug(" >> Windream initiiert", False)
             Return True
         Catch ex As Exception
@@ -519,10 +515,29 @@ LOGGER.Error(ex)
                         LOGGER.Error(ex)
                         clsLogger.Add("Error in LoadSimpleData for LookupControl2: " & ex.Message)
                     End Try
-                ElseIf TypeOf control Is DataGridView Then
+                ElseIf TypeOf control Is GridControl Then
                     Try
-                        Dim dataGridView As DataGridView = control
+                        Dim dataGridView As GridControl = control
-                        dataGridView.DataSource = dt
+                        Dim oDataSource As DataTable = dataGridView.DataSource
+
+                        If oDataSource Is Nothing OrElse oDataSource.Rows.Count = 0 Then
+                            'dataGridView.DataSource = dt
+
+                            Dim oDatatable As DataTable = dt.Clone()
+
+                            For Each oColumn As DataColumn In oDatatable.Columns
+                                If oDataSource.Columns(oColumn.ColumnName) Is Nothing Then
+                                    'oDataSource.Columns.Add(oColumn)
+                                    oDataSource.Columns.Add(oColumn.ColumnName, oColumn.DataType)
+                                End If
+                            Next
+
+                            For Each oRow As DataRow In dt.Rows
+                                oDataSource.ImportRow(oRow)
+                            Next
+
+                            dataGridView.DataSource = oDataSource
+                        End If
                     Catch ex As Exception
                         LOGGER.Error(ex)
                         clsLogger.Add("Error in LoadSimpleData for DataGridView: " & ex.Message)
@@ -755,7 +770,7 @@ LOGGER.Error(ex)
 
                 pnldesigner.Controls.Add(ctrl)
 
-                LoadSimpleData(ctrl, oControlRow.Item("GUID"))
+                'LoadSimpleData(ctrl, oControlRow.Item("GUID"))
             Next
             LOGGER.Debug(" >> Controls geladen", False)
             LOGGER.Info("", False)
@@ -1413,7 +1428,12 @@ LOGGER.Error(ex)
 
 
 
-                        FillIndexValues()
+                        FillIndexValues(first)
+
+                        For Each oControl As Control In pnldesigner.Controls
+                            LoadSimpleData(oControl, oControl.Tag)
+                        Next
+
                         LOGGER.Debug(" >> Indexmaske geladen", False)
                         LOGGER.Debug("", False)
 
@@ -1874,7 +1894,7 @@ LOGGER.Error(ex)
 
 
     End Function
-    Sub FillIndexValues()
+    Sub FillIndexValues(first As Boolean)
         Dim oControlType As String
         Dim oIndexName As String
         Try
@@ -2038,6 +2058,7 @@ LOGGER.Error(ex)
                                         Select Case oTyp
                                             'Tabellendarstellung
                                             Case "TABLE"
+
                                                 Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = " & oControlId)
                                                 Dim SpaltenWerte As String()
                                                 LOGGER.Debug($" >> {dt.Rows.Count} Columns configured for control {oControlId}.", False)
@@ -2114,13 +2135,18 @@ LOGGER.Error(ex)
                                             'Tabellendarstellung
                                             Case "TABLE"
                                                 Dim dt As DataTable = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_CONTROL_TABLE WHERE CONTROL_ID = " & oControlId)
+
                                                 Dim SpaltenWerte As String()
                                                 LOGGER.Debug($" >> {dt.Rows.Count} Columns configured for control {oControlId}.", False)
                                                 If dt.Rows.Count > 1 Then
+                                                    Dim oDataSource As DataTable = dgv.DataSource
+                                                    oDataSource.Rows.Clear()
+
                                                     For Each Zeile As Object In wertWD
                                                         LOGGER.Debug($" >> vektorrow Value {Zeile.ToString}...", False)
                                                         SpaltenWerte = Split(Zeile, Delimiter)
-                                                        Dim oDataSource As DataTable = dgv.DataSource
+
+
 
                                                         Select Case dt.Rows.Count
                                                             Case 1
@@ -2178,6 +2204,16 @@ LOGGER.Error(ex)
                                         End Select
 
 
+                                    End If
+
+                                Else
+                                    If first = False Then
+                                        Dim oDataSource As DataTable = dgv.DataSource
+
+                                        If oDataSource.Rows.Count > 0 Then
+                                            oDataSource.Rows.Clear()
+                                        End If
+
                                     End If
                                 End If
                             End If
@@ -3216,7 +3252,15 @@ LOGGER.Error(ex)
                                                     'Das Array anpassen
                                                     ReDim Preserve myVektorArr(ZeilenGrid)
 
-                                                    str = String.Join(Delimiter, row.ItemArray)
+                                                    Dim oValueList As New List(Of String)
+
+                                                    For Each item In row.ItemArray
+                                                        item = NotNull(item, String.Empty)
+                                                        If TypeOf item IsNot String Then item.ToString()
+                                                        oValueList.Add(item)
+                                                    Next
+
+                                                    str = String.Join(Delimiter, oValueList.ToArray)
 
                                                     'Den Wert im Array speichern
                                                     myVektorArr(ZeilenGrid) = str
@@ -3480,13 +3524,13 @@ LOGGER.Error(ex)
     Private Sub DateieigenschaftenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DateieigenschaftenToolStripMenuItem.Click
         If Windream_Document_Path <> "" Then
             Cursor = Cursors.WaitCursor
-            Dim sei As New SHELLEXECUTEINFO
+            Dim oShellExecuteInfo As New SHELLEXECUTEINFO
-            sei.cbSize = Marshal.SizeOf(sei)
+            oShellExecuteInfo.cbSize = Marshal.SizeOf(oShellExecuteInfo)
-            sei.lpVerb = "properties"
+            oShellExecuteInfo.lpVerb = "properties"
-            sei.lpFile = Filesystem_Document_Path
+            oShellExecuteInfo.lpFile = Filesystem_Document_Path
-            sei.nShow = SW_SHOW
+            oShellExecuteInfo.nShow = SW_SHOW
-            sei.fMask = SEE_MASK_INVOKEIDLIST
+            oShellExecuteInfo.fMask = SEE_MASK_INVOKEIDLIST
-            If Not ShellExecuteEx(sei) Then
+            If Not ShellExecuteEx(oShellExecuteInfo) Then
                 Dim ex As New System.ComponentModel.Win32Exception(System.Runtime.InteropServices.Marshal.GetLastWin32Error())
                 MsgBox("Fehler in Datei-Eigenschaften öffnen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
             End If