jj 15_12

app/DD-Record-Organiser/ClassControlBuilder.vb

@@ -465,7 +465,8 @@ Public Class ClassControlBuilder
             End If
         Next
     End Sub
-    Public Sub AddLabel(name As String,
+    Public Sub AddLabel(id As Integer,
+                        name As String,
                         text As String,
                         x As Integer,
                         y As Integer,
@@ -482,6 +483,7 @@ Public Class ClassControlBuilder
             Dim control As Label = New Label
             Dim defaultSize As Size = New Size(200, 27)
 
+            control.Tag = id
             control.Name = name
             control.Text = text
             control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle))
@@ -534,7 +536,8 @@ Public Class ClassControlBuilder
 
     End Sub
 
-    Public Sub AddTextBox(name As String,
+    Public Sub AddTextBox(id As Integer,
+                          name As String,
                           x As Integer,
                           y As Integer,
                           fontfamily As String,
@@ -555,6 +558,7 @@ Public Class ClassControlBuilder
             Dim control As New TextBox
             Dim defaultSize As Size = New Size(200, 27)
 
+            control.Tag = id
             control.Name = name
             control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle))
             control.ForeColor = IntToColor(fontcolor)
@@ -611,7 +615,8 @@ Public Class ClassControlBuilder
 
 
     End Sub
-    Public Sub AddCheckBox(name As String,
+    Public Sub AddCheckBox(id As Integer,
+                           name As String,
                            text As String,
                            Checked As Boolean,
                            x As Integer,
@@ -631,6 +636,8 @@ Public Class ClassControlBuilder
         Try
             Dim control As New CheckBox
             Dim defaultSize As Size = New Size(150, 27)
+
+            control.Tag = id
             control.Checked = Checked
             control.Name = name
             control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle))
@@ -677,7 +684,8 @@ Public Class ClassControlBuilder
         End Try
 
     End Sub
-    Public Sub AddRadioButton(name As String,
+    Public Sub AddRadioButton(id As Integer,
+                              name As String,
                           text As String,
                           Checked As Boolean,
                           x As Integer,
@@ -698,6 +706,7 @@ Public Class ClassControlBuilder
             Dim control As New RadioButton
             Dim defaultSize As Size = New Size(150, 27)
 
+            control.Tag = id
             control.Name = name
             control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle))
             control.ForeColor = IntToColor(fontcolor)
@@ -742,7 +751,8 @@ Public Class ClassControlBuilder
         End Try
 
     End Sub
-    Public Sub AddComboBox(name As String,
+    Public Sub AddComboBox(id As Integer,
+                           name As String,
                            x As Integer,
                            y As Integer,
                            fontfamily As String,
@@ -764,6 +774,7 @@ Public Class ClassControlBuilder
             Dim control As New ComboBox
             Dim defaultSize As Size = New Size(120, 24)
 
+            control.Tag = id
             control.Name = name
             control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle))
             control.ForeColor = IntToColor(fontcolor)
@@ -897,7 +908,8 @@ Public Class ClassControlBuilder
         iFoundIndex = cbo.FindStringExact(cbo.Text)
         cbo.SelectedIndex = iFoundIndex
     End Sub
-    Public Sub AddDateTimePicker(name As String,
+    Public Sub AddDateTimePicker(id As Integer,
+                                name As String,
                              x As Integer,
                              y As Integer,
                              fontfamily As String,
@@ -916,6 +928,7 @@ Public Class ClassControlBuilder
             'Dim control As New DateTimePicker
             Dim defaultSize As Size = New Size(120, 24)
 
+            control.Tag = id
             control.Name = name
             'control.Format = DateTimePickerFormat.Short
             'control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle))
@@ -959,7 +972,8 @@ Public Class ClassControlBuilder
         End Try
 
     End Sub
-    Public Sub AddDataGridView(name As String,
+    Public Sub AddDataGridView(id As Integer,
+                               name As String,
                                x As Integer,
                                y As Integer,
                                vwidth As Integer,
@@ -973,6 +987,7 @@ Public Class ClassControlBuilder
         Dim column As New DataGridViewTextBoxColumn
         Dim defaultSize = New Size(130, 150)
 
+        control.Tag = id
         control.Name = name
         control.BackgroundColor = SystemColors.ControlDark
         control.AllowUserToAddRows = False
@@ -1015,7 +1030,8 @@ Public Class ClassControlBuilder
             Me.AddToPanel(control)
         End If
     End Sub
-    Public Sub AddPictureBox(name As String,
+    Public Sub AddPictureBox(id As Integer,
+                             name As String,
                              x As Integer,
                              y As Integer,
                              vwidth As Integer,
@@ -1047,6 +1063,7 @@ Public Class ClassControlBuilder
         End If
         ctx.Items.Add(itemSave)
 
+        control.Tag = id
         control.Name = name
         control.Parent = _master_panel
         control.BorderStyle = BorderStyle.FixedSingle
@@ -1081,7 +1098,8 @@ Public Class ClassControlBuilder
             Me.AddToPanel(control)
         End If
     End Sub
-    Public Sub AddGroupBox(name As String,
+    Public Sub AddGroupBox(id As Integer,
+                           name As String,
                            Caption As String,
                            x As Integer,
                            y As Integer,
@@ -1099,6 +1117,7 @@ Public Class ClassControlBuilder
         Dim control As New GroupBox
         Dim defaultSize = New Size(200, 100)
 
+        control.Tag = id
         control.Name = name
         control.Parent = _master_panel
         control.Text = Caption
@@ -1136,7 +1155,8 @@ Public Class ClassControlBuilder
             Me.AddToPanel(control)
         End If
     End Sub
-    Public Sub FunctionAddAppointment(name As String,
+    Public Sub FunctionAddAppointment(id As Integer,
+                                      name As String,
                                       text As String,
                                       x As Integer,
                                       y As Integer,
@@ -1149,9 +1169,10 @@ Public Class ClassControlBuilder
             Dim control As Button = New Button
             Dim defaultSize As Size = New Size(200, 27)
 
+            control.Tag = id
             control.Name = name
             control.Text = text
-            control.Tag = "ADDAPPOINTMENT"
+            'control.Tag = "ADDAPPOINTMENT"
             control.TabStop = False
             control.Image = My.Resources.calendar_add
             control.ImageAlign = ContentAlignment.MiddleRight
@@ -1190,7 +1211,8 @@ Public Class ClassControlBuilder
 
 
     End Sub
-    Public Sub FunctionAddFormData(name As String,
+    Public Sub FunctionAddFormData(id As Integer,
+                                   name As String,
                                    text As String,
                                    x As Integer,
                                    y As Integer,
@@ -1203,9 +1225,10 @@ Public Class ClassControlBuilder
             Dim control As Button = New Button
             Dim defaultSize As Size = New Size(30, 21)
 
+            control.Tag = id
             control.Name = name
             control.Text = ""
-            control.Tag = "ADDFORMDATA"
+            'control.Tag = "ADDFORMDATA"
             control.TabStop = False
             control.Image = My.Resources.add1
 
@@ -1242,7 +1265,8 @@ Public Class ClassControlBuilder
             MsgBox("Fehler: " + vbNewLine + ex.Message)
         End Try
     End Sub
-    Public Sub AddCheckedListBox(name As String,
+    Public Sub AddCheckedListBox(id As Integer,
+                                 name As String,
                           x As Integer,
                           y As Integer,
                           fontfamily As String,
@@ -1265,6 +1289,7 @@ Public Class ClassControlBuilder
 
             'control.CheckOnClick = True
             ' control.CheckStyle = DevExpress.XtraEditors.Controls.CheckStyles.Style3
+            control.Tag = id
             control.Name = name
             control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle))
             control.ForeColor = IntToColor(fontcolor)
@@ -1342,7 +1367,8 @@ Public Class ClassControlBuilder
             MsgBox("Error in AddCheckedListBox: " + vbNewLine + ex.Message)
         End Try
     End Sub
-    Public Sub AddListBox(name As String,
+    Public Sub AddListBox(id As Integer,
+                          name As String,
                           x As Integer,
                           y As Integer,
                           fontfamily As String,
@@ -1365,6 +1391,7 @@ Public Class ClassControlBuilder
 
             'control.CheckOnClick = True
             ' control.CheckStyle = DevExpress.XtraEditors.Controls.CheckStyles.Style3
+            control.Tag = id
             control.Name = name
             control.Font = New Font(fontfamily, fontsize, CType(fontstyle, FontStyle))
             control.ForeColor = IntToColor(fontcolor)