jj 17.11

app/DD-Record-Organiser/frmConstructorDesigner.Designer.vb

@@ -57,7 +57,6 @@ Partial Class frmConstructorDesigner
         Me.TBPMO_FORM_CONSTRUCTORBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
         Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
-        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator = New System.Windows.Forms.ToolStripSeparator()
@@ -66,6 +65,7 @@ Partial Class frmConstructorDesigner
         Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
         Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton()
         Me.TBPMO_FORM_CONSTRUCTOR_DETAILBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.TreeViewDetails = New System.Windows.Forms.TreeView()
@@ -464,12 +464,6 @@ Partial Class frmConstructorDesigner
         Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem"
         resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
         '
-        'BindingNavigatorDeleteItem
-        '
-        Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
-        Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
-        '
         'BindingNavigatorMoveFirstItem
         '
         Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -514,6 +508,12 @@ Partial Class frmConstructorDesigner
         Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2"
         resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
         '
+        'BindingNavigatorDeleteItem
+        '
+        Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
+        Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
+        '
         'TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem
         '
         Me.TBPMO_FORM_CONSTRUCTORBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image

app/DD-Record-Organiser/frmConstructor_Main.resx

@@ -343,7 +343,7 @@
     <value>0, 25</value>
   </data>
   <data name="GridControlMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1074, 212</value>
+    <value>1067, 212</value>
   </data>
   <data name="GridControlMain.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -460,7 +460,7 @@
     <value>0, 0</value>
   </data>
   <data name="ToolStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1074, 25</value>
+    <value>1067, 25</value>
   </data>
   <data name="ToolStrip1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -541,7 +541,7 @@
     <value>0, 0</value>
   </data>
   <data name="pnlDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>786, 343</value>
+    <value>786, 336</value>
   </data>
   <data name="pnlDetails.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -565,7 +565,7 @@
     <value>Panel2</value>
   </data>
   <data name="SplitContainerDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
   </data>
   <data name="SplitContainerDetails.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -726,7 +726,7 @@
     <value>1</value>
   </data>
   <data name="TabDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="TabDetails.Text" xml:space="preserve">
     <value>Detailansicht</value>
@@ -744,7 +744,7 @@
     <value>0</value>
   </data>
   <data name="TCDetails.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1362, 403</value>
+    <value>1362, 396</value>
   </data>
   <data name="TCDetails.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -882,7 +882,7 @@
     <value>Aqua</value>
   </data>
   <data name="GridControlDocSearch.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
   </data>
   <data name="GridControlDocSearch.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
@@ -1009,7 +1009,7 @@
     <value>1</value>
   </data>
   <data name="TabWindream.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="TabWindream.Text" xml:space="preserve">
     <value>Dateien</value>
@@ -1440,7 +1440,7 @@
     <value>2</value>
   </data>
   <data name="TabFollowUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="TabFollowUp.Text" xml:space="preserve">
     <value>Wiedervorlage</value>
@@ -1467,7 +1467,7 @@
     <value>Cyan</value>
   </data>
   <data name="GridControlPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
   </data>
   <data name="GridControlPos.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1491,7 +1491,7 @@
     <value>0, 25</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 347</value>
+    <value>1356, 340</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -1695,7 +1695,7 @@
 </value>
   </data>
   <data name="TabPos.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="TabPos.Text" xml:space="preserve">
     <value>Positionen</value>
@@ -1773,7 +1773,7 @@
     <value>1</value>
   </data>
   <data name="XtraTabPageVariant.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1356, 372</value>
+    <value>1356, 365</value>
   </data>
   <data name="XtraTabPageVariant.Text" xml:space="preserve">
     <value>Vorgängervarianten</value>

app/DD-Record-Organiser/frmConstructor_Main.vb

@@ -3021,9 +3021,17 @@ Public Class frmConstructor_Main
 
                     date_column.DisplayFormat.FormatType = FormatType.DateTime
                     date_column.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
+
                     date_column.OptionsFilter.FilterPopupMode = FilterPopupMode.Default
                     date_column.OptionsFilter.AutoFilterCondition = AutoFilterCondition.Contains
 
+                    date_edit.DisplayFormat.FormatType = FormatType.DateTime
+                    date_edit.DisplayFormat.FormatString = CURRENT_DATE_FORMAT
+
+                    date_edit.Mask.MaskType = Mask.MaskType.DateTime
+                    date_edit.Mask.EditMask = CURRENT_DATE_FORMAT
+                    date_edit.Mask.UseMaskAsDisplayFormat = True
+
                     date_column.ColumnEdit = date_edit
                     date_column.FilterMode = ColumnFilterMode.DisplayText
                 Next

app/DD-Record-Organiser/frmEntities.Designer.vb

@@ -28,26 +28,19 @@ Partial Class frmEntities
         Dim NAMELabel As System.Windows.Forms.Label
         Dim LEVELLabel As System.Windows.Forms.Label
         Dim ADDED_WHOLabel As System.Windows.Forms.Label
-        Dim CHANGED_WHOLabel As System.Windows.Forms.Label
         Dim CHANGED_WHOLabel1 As System.Windows.Forms.Label
-        Dim ADDED_WHOLabel1 As System.Windows.Forms.Label
-        Dim FORM_IDLabel As System.Windows.Forms.Label
-        Dim FORM_TITLELabel As System.Windows.Forms.Label
         Dim DESCRIPTIONLabel As System.Windows.Forms.Label
         Dim Label1 As System.Windows.Forms.Label
         Dim GUIDLabel As System.Windows.Forms.Label
+        Dim Label5 As System.Windows.Forms.Label
         Me.TBPMO_FORMBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
         Me.TBPMO_FORMBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
         Me.ToolStripButton1 = New System.Windows.Forms.ToolStripButton()
         Me.ToolStripButton2 = New System.Windows.Forms.ToolStripButton()
-        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
         Me.DESCRIPTIONTextBox = New System.Windows.Forms.TextBox()
         Me.TBPMO_FORM_VIEWBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.FORM_TITLETextBox = New System.Windows.Forms.TextBox()
-        Me.FORM_IDTextBox = New System.Windows.Forms.TextBox()
-        Me.ADDED_WHOTextBox1 = New System.Windows.Forms.TextBox()
-        Me.CHANGED_WHOTextBoxPMOFormView = New System.Windows.Forms.TextBox()
         Me.CHANGED_WHOTextBoxPMOForm = New System.Windows.Forms.TextBox()
         Me.PARENT_IDTextBox = New System.Windows.Forms.TextBox()
         Me.NAMETextBox = New System.Windows.Forms.TextBox()
@@ -77,19 +70,15 @@ Partial Class frmEntities
         NAMELabel = New System.Windows.Forms.Label()
         LEVELLabel = New System.Windows.Forms.Label()
         ADDED_WHOLabel = New System.Windows.Forms.Label()
-        CHANGED_WHOLabel = New System.Windows.Forms.Label()
         CHANGED_WHOLabel1 = New System.Windows.Forms.Label()
-        ADDED_WHOLabel1 = New System.Windows.Forms.Label()
-        FORM_IDLabel = New System.Windows.Forms.Label()
-        FORM_TITLELabel = New System.Windows.Forms.Label()
         DESCRIPTIONLabel = New System.Windows.Forms.Label()
         Label1 = New System.Windows.Forms.Label()
         GUIDLabel = New System.Windows.Forms.Label()
+        Label5 = New System.Windows.Forms.Label()
         CType(Me.TBPMO_FORMBindingNavigator, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.TBPMO_FORMBindingNavigator.SuspendLayout()
         CType(Me.TBPMO_FORMBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.GroupBox1.SuspendLayout()
         CType(Me.TBPMO_FORM_VIEWBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox2.SuspendLayout()
         CType(Me.NumericUpDown1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -116,31 +105,11 @@ Partial Class frmEntities
         resources.ApplyResources(ADDED_WHOLabel, "ADDED_WHOLabel")
         ADDED_WHOLabel.Name = "ADDED_WHOLabel"
         '
-        'CHANGED_WHOLabel
-        '
-        resources.ApplyResources(CHANGED_WHOLabel, "CHANGED_WHOLabel")
-        CHANGED_WHOLabel.Name = "CHANGED_WHOLabel"
-        '
         'CHANGED_WHOLabel1
         '
         resources.ApplyResources(CHANGED_WHOLabel1, "CHANGED_WHOLabel1")
         CHANGED_WHOLabel1.Name = "CHANGED_WHOLabel1"
         '
-        'ADDED_WHOLabel1
-        '
-        resources.ApplyResources(ADDED_WHOLabel1, "ADDED_WHOLabel1")
-        ADDED_WHOLabel1.Name = "ADDED_WHOLabel1"
-        '
-        'FORM_IDLabel
-        '
-        resources.ApplyResources(FORM_IDLabel, "FORM_IDLabel")
-        FORM_IDLabel.Name = "FORM_IDLabel"
-        '
-        'FORM_TITLELabel
-        '
-        resources.ApplyResources(FORM_TITLELabel, "FORM_TITLELabel")
-        FORM_TITLELabel.Name = "FORM_TITLELabel"
-        '
         'DESCRIPTIONLabel
         '
         resources.ApplyResources(DESCRIPTIONLabel, "DESCRIPTIONLabel")
@@ -193,22 +162,6 @@ Partial Class frmEntities
         resources.ApplyResources(Me.ToolStripButton2, "ToolStripButton2")
         Me.ToolStripButton2.Name = "ToolStripButton2"
         '
-        'GroupBox1
-        '
-        Me.GroupBox1.Controls.Add(DESCRIPTIONLabel)
-        Me.GroupBox1.Controls.Add(Me.DESCRIPTIONTextBox)
-        Me.GroupBox1.Controls.Add(FORM_TITLELabel)
-        Me.GroupBox1.Controls.Add(Me.FORM_TITLETextBox)
-        Me.GroupBox1.Controls.Add(FORM_IDLabel)
-        Me.GroupBox1.Controls.Add(Me.FORM_IDTextBox)
-        Me.GroupBox1.Controls.Add(ADDED_WHOLabel1)
-        Me.GroupBox1.Controls.Add(Me.ADDED_WHOTextBox1)
-        Me.GroupBox1.Controls.Add(CHANGED_WHOLabel)
-        Me.GroupBox1.Controls.Add(Me.CHANGED_WHOTextBoxPMOFormView)
-        resources.ApplyResources(Me.GroupBox1, "GroupBox1")
-        Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.TabStop = False
-        '
         'DESCRIPTIONTextBox
         '
         Me.DESCRIPTIONTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_VIEWBindingSource, "DESCRIPTION", True))
@@ -227,27 +180,6 @@ Partial Class frmEntities
         resources.ApplyResources(Me.FORM_TITLETextBox, "FORM_TITLETextBox")
         Me.FORM_TITLETextBox.Name = "FORM_TITLETextBox"
         '
-        'FORM_IDTextBox
-        '
-        Me.FORM_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_VIEWBindingSource, "FORM_ID", True))
-        resources.ApplyResources(Me.FORM_IDTextBox, "FORM_IDTextBox")
-        Me.FORM_IDTextBox.Name = "FORM_IDTextBox"
-        Me.FORM_IDTextBox.ReadOnly = True
-        '
-        'ADDED_WHOTextBox1
-        '
-        Me.ADDED_WHOTextBox1.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_VIEWBindingSource, "ADDED_WHO", True))
-        resources.ApplyResources(Me.ADDED_WHOTextBox1, "ADDED_WHOTextBox1")
-        Me.ADDED_WHOTextBox1.Name = "ADDED_WHOTextBox1"
-        Me.ADDED_WHOTextBox1.ReadOnly = True
-        '
-        'CHANGED_WHOTextBoxPMOFormView
-        '
-        Me.CHANGED_WHOTextBoxPMOFormView.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORM_VIEWBindingSource, "CHANGED_WHO", True))
-        resources.ApplyResources(Me.CHANGED_WHOTextBoxPMOFormView, "CHANGED_WHOTextBoxPMOFormView")
-        Me.CHANGED_WHOTextBoxPMOFormView.Name = "CHANGED_WHOTextBoxPMOFormView"
-        Me.CHANGED_WHOTextBoxPMOFormView.ReadOnly = True
-        '
         'CHANGED_WHOTextBoxPMOForm
         '
         Me.CHANGED_WHOTextBoxPMOForm.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPMO_FORMBindingSource, "CHANGED_WHO", True))
@@ -304,13 +236,17 @@ Partial Class frmEntities
         Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_RIGHT_GROUPTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_RIGHT_USERTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_STRUCTURE_NODES_CONFIGURATIONTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_TEMPLATE_PATTERNTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_IMPORT_PROFILE_IDXTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_IMPORT_PROFILETableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WD_NAMECONVENTION_FORMATTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_WORKFLOW_TASK_HISTORYTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WORKFLOW_TASK_STATETableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WORKFLOWTableAdapter = Nothing
         Me.TableAdapterManager.UpdateOrder = DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
@@ -321,9 +257,13 @@ Partial Class frmEntities
         '
         'GroupBox2
         '
+        Me.GroupBox2.Controls.Add(DESCRIPTIONLabel)
+        Me.GroupBox2.Controls.Add(Label5)
+        Me.GroupBox2.Controls.Add(Me.DESCRIPTIONTextBox)
         Me.GroupBox2.Controls.Add(Me.Label4)
         Me.GroupBox2.Controls.Add(Me.SINGLE_RECORDCheckBox)
         Me.GroupBox2.Controls.Add(Me.NumericUpDown1)
+        Me.GroupBox2.Controls.Add(Me.FORM_TITLETextBox)
         Me.GroupBox2.Controls.Add(Me.GUIDTextBox)
         Me.GroupBox2.Controls.Add(GUIDLabel)
         Me.GroupBox2.Controls.Add(Label1)
@@ -444,6 +384,11 @@ Partial Class frmEntities
         resources.ApplyResources(Me.Label3, "Label3")
         Me.Label3.Name = "Label3"
         '
+        'Label5
+        '
+        resources.ApplyResources(Label5, "Label5")
+        Label5.Name = "Label5"
+        '
         'frmEntities
         '
         resources.ApplyResources(Me, "$this")
@@ -456,7 +401,6 @@ Partial Class frmEntities
         Me.Controls.Add(Me.btnsave)
         Me.Controls.Add(Me.btndelete)
         Me.Controls.Add(Me.btninsert)
-        Me.Controls.Add(Me.GroupBox1)
         Me.Controls.Add(Me.GroupBox2)
         Me.Controls.Add(Me.TreeViewEntity)
         Me.Controls.Add(Me.TBPMO_FORMBindingNavigator)
@@ -466,8 +410,6 @@ Partial Class frmEntities
         Me.TBPMO_FORMBindingNavigator.PerformLayout()
         CType(Me.TBPMO_FORMBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox1.PerformLayout()
         CType(Me.TBPMO_FORM_VIEWBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupBox2.ResumeLayout(False)
         Me.GroupBox2.PerformLayout()
@@ -483,7 +425,6 @@ Partial Class frmEntities
     Friend WithEvents TableAdapterManager As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager
     Friend WithEvents TBPMO_FORMBindingNavigator As System.Windows.Forms.BindingNavigator
     Friend WithEvents ToolStripButton1 As System.Windows.Forms.ToolStripButton
-    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
     Friend WithEvents PARENT_IDTextBox As System.Windows.Forms.TextBox
     Friend WithEvents NAMETextBox As System.Windows.Forms.TextBox
     Friend WithEvents ADDED_WHOTextBox As System.Windows.Forms.TextBox
@@ -491,11 +432,8 @@ Partial Class frmEntities
     Friend WithEvents TBPMO_FORM_VIEWBindingSource As System.Windows.Forms.BindingSource
     Friend WithEvents TBPMO_FORM_VIEWTableAdapter As DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_VIEWTableAdapter
     Friend WithEvents CHANGED_WHOTextBoxPMOForm As System.Windows.Forms.TextBox
-    Friend WithEvents CHANGED_WHOTextBoxPMOFormView As System.Windows.Forms.TextBox
-    Friend WithEvents ADDED_WHOTextBox1 As System.Windows.Forms.TextBox
     Friend WithEvents DESCRIPTIONTextBox As System.Windows.Forms.TextBox
     Friend WithEvents FORM_TITLETextBox As System.Windows.Forms.TextBox
-    Friend WithEvents FORM_IDTextBox As System.Windows.Forms.TextBox
     Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
     Friend WithEvents ComboBox1 As System.Windows.Forms.ComboBox
     Friend WithEvents SHOW_FORM_CONSTRUCTCheckBox As System.Windows.Forms.CheckBox

app/DD-Record-Organiser/frmEntities.resx

@@ -150,7 +150,7 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;PARENT_IDLabel.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>12</value>
   </data>
   <metadata name="NAMELabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -162,7 +162,7 @@
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="NAMELabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 90</value>
+    <value>6, 91</value>
   </data>
   <data name="NAMELabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>46, 17</value>
@@ -183,7 +183,7 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;NAMELabel.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>17</value>
   </data>
   <metadata name="LEVELLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -195,7 +195,7 @@
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="LEVELLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 121</value>
+    <value>6, 183</value>
   </data>
   <data name="LEVELLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>80, 17</value>
@@ -216,7 +216,7 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;LEVELLabel.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>15</value>
   </data>
   <metadata name="ADDED_WHOLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -228,7 +228,7 @@
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="ADDED_WHOLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 152</value>
+    <value>6, 214</value>
   </data>
   <data name="ADDED_WHOLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 17</value>
@@ -249,40 +249,7 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;ADDED_WHOLabel.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>14</value>
-  </data>
-  <metadata name="CHANGED_WHOLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <data name="CHANGED_WHOLabel.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="CHANGED_WHOLabel.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt</value>
-  </data>
-  <data name="CHANGED_WHOLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>177, 117</value>
-  </data>
-  <data name="CHANGED_WHOLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>90, 17</value>
-  </data>
-  <data name="CHANGED_WHOLabel.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
-  </data>
-  <data name="CHANGED_WHOLabel.Text" xml:space="preserve">
-    <value>Geändert wer:</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOLabel.Name" xml:space="preserve">
-    <value>CHANGED_WHOLabel</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOLabel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOLabel.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOLabel.ZOrder" xml:space="preserve">
-    <value>8</value>
   </data>
   <metadata name="CHANGED_WHOLabel1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -294,7 +261,7 @@
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="CHANGED_WHOLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>5, 182</value>
+    <value>5, 244</value>
   </data>
   <data name="CHANGED_WHOLabel1.Size" type="System.Drawing.Size, System.Drawing">
     <value>90, 17</value>
@@ -315,107 +282,8 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;CHANGED_WHOLabel1.ZOrder" xml:space="preserve">
-    <value>16</value>
-  </data>
-  <metadata name="ADDED_WHOLabel1.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <data name="ADDED_WHOLabel1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="ADDED_WHOLabel1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt</value>
-  </data>
-  <data name="ADDED_WHOLabel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 117</value>
-  </data>
-  <data name="ADDED_WHOLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 17</value>
-  </data>
-  <data name="ADDED_WHOLabel1.TabIndex" type="System.Int32, mscorlib">
-    <value>18</value>
-  </data>
-  <data name="ADDED_WHOLabel1.Text" xml:space="preserve">
-    <value>Erstellt wer:</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOLabel1.Name" xml:space="preserve">
-    <value>ADDED_WHOLabel1</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOLabel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOLabel1.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOLabel1.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <metadata name="FORM_IDLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <data name="FORM_IDLabel.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="FORM_IDLabel.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt</value>
-  </data>
-  <data name="FORM_IDLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 21</value>
-  </data>
-  <data name="FORM_IDLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>58, 17</value>
-  </data>
-  <data name="FORM_IDLabel.TabIndex" type="System.Int32, mscorlib">
-    <value>19</value>
-  </data>
-  <data name="FORM_IDLabel.Text" xml:space="preserve">
-    <value>Form-ID:</value>
-  </data>
-  <data name="&gt;&gt;FORM_IDLabel.Name" xml:space="preserve">
-    <value>FORM_IDLabel</value>
-  </data>
-  <data name="&gt;&gt;FORM_IDLabel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;FORM_IDLabel.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;FORM_IDLabel.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <metadata name="FORM_TITLELabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </metadata>
-  <data name="FORM_TITLELabel.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="FORM_TITLELabel.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt</value>
-  </data>
-  <data name="FORM_TITLELabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>73, 21</value>
-  </data>
-  <data name="FORM_TITLELabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>347, 17</value>
-  </data>
-  <data name="FORM_TITLELabel.TabIndex" type="System.Int32, mscorlib">
     <value>20</value>
   </data>
-  <data name="FORM_TITLELabel.Text" xml:space="preserve">
-    <value>Titel der Entität: (Anzeige in TreeView/Hierachie-Übersicht)</value>
-  </data>
-  <data name="&gt;&gt;FORM_TITLELabel.Name" xml:space="preserve">
-    <value>FORM_TITLELabel</value>
-  </data>
-  <data name="&gt;&gt;FORM_TITLELabel.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;FORM_TITLELabel.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;FORM_TITLELabel.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
   <metadata name="DESCRIPTIONLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
   </metadata>
@@ -426,7 +294,7 @@
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="DESCRIPTIONLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>7, 69</value>
+    <value>6, 153</value>
   </data>
   <data name="DESCRIPTIONLabel.Size" type="System.Drawing.Size, System.Drawing">
     <value>89, 17</value>
@@ -444,7 +312,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;DESCRIPTIONLabel.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
+    <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;DESCRIPTIONLabel.ZOrder" xml:space="preserve">
     <value>0</value>
@@ -459,7 +327,7 @@
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 236</value>
+    <value>6, 298</value>
   </data>
   <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
     <value>68, 17</value>
@@ -480,7 +348,7 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>9</value>
   </data>
   <metadata name="GUIDLabel.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>False</value>
@@ -513,10 +381,10 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;GUIDLabel.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>8</value>
   </data>
   <metadata name="TBPMO_FORMBindingNavigator.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
+    <value>877, 17</value>
   </metadata>
   <metadata name="TBPMO_FORMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>160, 17</value>
@@ -575,19 +443,19 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;TBPMO_FORMBindingNavigator.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>10</value>
   </data>
   <metadata name="TBPMO_FORM_VIEWBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>244, 56</value>
+    <value>1104, 17</value>
   </metadata>
   <data name="DESCRIPTIONTextBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="DESCRIPTIONTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>10, 89</value>
+    <value>147, 150</value>
   </data>
   <data name="DESCRIPTIONTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>399, 25</value>
+    <value>245, 25</value>
   </data>
   <data name="DESCRIPTIONTextBox.TabIndex" type="System.Int32, mscorlib">
     <value>22</value>
@@ -599,19 +467,19 @@
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;DESCRIPTIONTextBox.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
+    <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;DESCRIPTIONTextBox.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="FORM_TITLETextBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="FORM_TITLETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>77, 41</value>
+    <value>147, 119</value>
   </data>
   <data name="FORM_TITLETextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>332, 25</value>
+    <value>245, 25</value>
   </data>
   <data name="FORM_TITLETextBox.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -623,115 +491,10 @@
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;FORM_TITLETextBox.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
+    <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;FORM_TITLETextBox.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>6</value>
-  </data>
-  <data name="FORM_IDTextBox.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt</value>
-  </data>
-  <data name="FORM_IDTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 41</value>
-  </data>
-  <data name="FORM_IDTextBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>56, 25</value>
-  </data>
-  <data name="FORM_IDTextBox.TabIndex" type="System.Int32, mscorlib">
-    <value>20</value>
-  </data>
-  <data name="&gt;&gt;FORM_IDTextBox.Name" xml:space="preserve">
-    <value>FORM_IDTextBox</value>
-  </data>
-  <data name="&gt;&gt;FORM_IDTextBox.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;FORM_IDTextBox.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;FORM_IDTextBox.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="ADDED_WHOTextBox1.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="ADDED_WHOTextBox1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt</value>
-  </data>
-  <data name="ADDED_WHOTextBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 137</value>
-  </data>
-  <data name="ADDED_WHOTextBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 25</value>
-  </data>
-  <data name="ADDED_WHOTextBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>19</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOTextBox1.Name" xml:space="preserve">
-    <value>ADDED_WHOTextBox1</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOTextBox1.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;ADDED_WHOTextBox1.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;ADDED_WHOTextBox1.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="CHANGED_WHOTextBoxPMOFormView.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="CHANGED_WHOTextBoxPMOFormView.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt</value>
-  </data>
-  <data name="CHANGED_WHOTextBoxPMOFormView.Location" type="System.Drawing.Point, System.Drawing">
-    <value>180, 137</value>
-  </data>
-  <data name="CHANGED_WHOTextBoxPMOFormView.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 25</value>
-  </data>
-  <data name="CHANGED_WHOTextBoxPMOFormView.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOTextBoxPMOFormView.Name" xml:space="preserve">
-    <value>CHANGED_WHOTextBoxPMOFormView</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOTextBoxPMOFormView.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;CHANGED_WHOTextBoxPMOFormView.Parent" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;CHANGED_WHOTextBoxPMOFormView.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="GroupBox1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Segoe UI, 9.75pt, style=Bold</value>
-  </data>
-  <data name="GroupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>328, 367</value>
-  </data>
-  <data name="GroupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>424, 174</value>
-  </data>
-  <data name="GroupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>18</value>
-  </data>
-  <data name="GroupBox1.Text" xml:space="preserve">
-    <value>Entity-View Properties:</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.Name" xml:space="preserve">
-    <value>GroupBox1</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;GroupBox1.ZOrder" xml:space="preserve">
-    <value>8</value>
   </data>
   <data name="CHANGED_WHOTextBoxPMOForm.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -740,7 +503,7 @@
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="CHANGED_WHOTextBoxPMOForm.Location" type="System.Drawing.Point, System.Drawing">
-    <value>125, 180</value>
+    <value>147, 242</value>
   </data>
   <data name="CHANGED_WHOTextBoxPMOForm.Size" type="System.Drawing.Size, System.Drawing">
     <value>173, 25</value>
@@ -758,13 +521,13 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;CHANGED_WHOTextBoxPMOForm.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>19</value>
   </data>
   <data name="PARENT_IDTextBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="PARENT_IDTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>125, 56</value>
+    <value>147, 56</value>
   </data>
   <data name="PARENT_IDTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 25</value>
@@ -782,13 +545,13 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;PARENT_IDTextBox.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>18</value>
   </data>
   <data name="NAMETextBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="NAMETextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>125, 87</value>
+    <value>147, 88</value>
   </data>
   <data name="NAMETextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>245, 25</value>
@@ -806,7 +569,7 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;NAMETextBox.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>16</value>
   </data>
   <data name="ADDED_WHOTextBox.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -815,7 +578,7 @@
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="ADDED_WHOTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>125, 149</value>
+    <value>147, 211</value>
   </data>
   <data name="ADDED_WHOTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>173, 25</value>
@@ -833,7 +596,7 @@
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;ADDED_WHOTextBox.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>13</value>
   </data>
   <metadata name="TBPMO_FORMTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>370, 17</value>
@@ -842,8 +605,45 @@
     <value>575, 17</value>
   </metadata>
   <metadata name="TBPMO_FORM_VIEWTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>488, 56</value>
+    <value>17, 56</value>
   </metadata>
+  <metadata name="Label5.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>False</value>
+  </metadata>
+  <data name="Label5.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label5.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Segoe UI, 9.75pt</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Label5.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="Label5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 122</value>
+  </data>
+  <data name="Label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 17</value>
+  </data>
+  <data name="Label5.TabIndex" type="System.Int32, mscorlib">
+    <value>27</value>
+  </data>
+  <data name="Label5.Text" xml:space="preserve">
+    <value>Anzeigename:</value>
+  </data>
+  <data name="&gt;&gt;Label5.Name" xml:space="preserve">
+    <value>Label5</value>
+  </data>
+  <data name="&gt;&gt;Label5.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label5.Parent" xml:space="preserve">
+    <value>GroupBox2</value>
+  </data>
+  <data name="&gt;&gt;Label5.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="Label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -851,7 +651,7 @@
     <value>Segoe UI, 8.25pt, style=Italic</value>
   </data>
   <data name="Label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>234, 270</value>
+    <value>256, 332</value>
   </data>
   <data name="Label4.Size" type="System.Drawing.Size, System.Drawing">
     <value>148, 26</value>
@@ -873,13 +673,13 @@ diese Entität angelegt werden.</value>
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>3</value>
   </data>
   <data name="SINGLE_RECORDCheckBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI Semibold, 9.75pt, style=Bold, Italic</value>
   </data>
   <data name="SINGLE_RECORDCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>125, 264</value>
+    <value>147, 326</value>
   </data>
   <data name="SINGLE_RECORDCheckBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>113, 24</value>
@@ -900,13 +700,13 @@ diese Entität angelegt werden.</value>
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;SINGLE_RECORDCheckBox.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>4</value>
   </data>
   <data name="NumericUpDown1.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="NumericUpDown1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>125, 119</value>
+    <value>147, 181</value>
   </data>
   <data name="NumericUpDown1.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 25</value>
@@ -924,13 +724,13 @@ diese Entität angelegt werden.</value>
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;NumericUpDown1.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>5</value>
   </data>
   <data name="GUIDTextBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="GUIDTextBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>125, 25</value>
+    <value>147, 25</value>
   </data>
   <data name="GUIDTextBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 25</value>
@@ -948,16 +748,16 @@ diese Entität angelegt werden.</value>
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;GUIDTextBox.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>7</value>
   </data>
   <metadata name="TBPMO_FORM_TYPEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>726, 56</value>
+    <value>255, 56</value>
   </metadata>
   <data name="ComboBox1.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="ComboBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>125, 233</value>
+    <value>147, 295</value>
   </data>
   <data name="ComboBox1.Size" type="System.Drawing.Size, System.Drawing">
     <value>220, 25</value>
@@ -975,13 +775,13 @@ diese Entität angelegt werden.</value>
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;ComboBox1.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>10</value>
   </data>
   <data name="SHOW_FORM_CONSTRUCTCheckBox.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt</value>
   </data>
   <data name="SHOW_FORM_CONSTRUCTCheckBox.Location" type="System.Drawing.Point, System.Drawing">
-    <value>125, 211</value>
+    <value>147, 273</value>
   </data>
   <data name="SHOW_FORM_CONSTRUCTCheckBox.Size" type="System.Drawing.Size, System.Drawing">
     <value>202, 24</value>
@@ -1002,7 +802,7 @@ diese Entität angelegt werden.</value>
     <value>GroupBox2</value>
   </data>
   <data name="&gt;&gt;SHOW_FORM_CONSTRUCTCheckBox.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>11</value>
   </data>
   <data name="GroupBox2.Font" type="System.Drawing.Font, System.Drawing">
     <value>Segoe UI, 9.75pt, style=Bold</value>
@@ -1011,7 +811,7 @@ diese Entität angelegt werden.</value>
     <value>328, 53</value>
   </data>
   <data name="GroupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>424, 308</value>
+    <value>424, 499</value>
   </data>
   <data name="GroupBox2.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
@@ -1029,9 +829,8 @@ diese Entität angelegt werden.</value>
     <value>$this</value>
   </data>
   <data name="&gt;&gt;GroupBox2.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>8</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="TreeViewEntity.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left</value>
   </data>
@@ -1054,10 +853,10 @@ diese Entität angelegt werden.</value>
     <value>$this</value>
   </data>
   <data name="&gt;&gt;TreeViewEntity.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>9</value>
   </data>
   <metadata name="TBPMO_FORM_TYPETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>968, 56</value>
+    <value>497, 56</value>
   </metadata>
   <data name="btninsert.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -1861,7 +1660,7 @@ welches die links dargestellte TreeView-Struktur umsetzt.</value>
     <value>DD_DMSDataSet</value>
   </data>
   <data name="&gt;&gt;DD_DMSDataSet.Type" xml:space="preserve">
-    <value>DD_Record_Organiser.DD_DMSDataSet, DD_DMSDataSet1.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DD_Record_Organiser.DD_DMSDataSet, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;ToolStripButton1.Name" xml:space="preserve">
     <value>ToolStripButton1</value>
@@ -1885,19 +1684,19 @@ welches die links dargestellte TreeView-Struktur umsetzt.</value>
     <value>TBPMO_FORMTableAdapter</value>
   </data>
   <data name="&gt;&gt;TBPMO_FORMTableAdapter.Type" xml:space="preserve">
-    <value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORMTableAdapter, DD_DMSDataSet1.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORMTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;TableAdapterManager.Name" xml:space="preserve">
     <value>TableAdapterManager</value>
   </data>
   <data name="&gt;&gt;TableAdapterManager.Type" xml:space="preserve">
-    <value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet1.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TableAdapterManager, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;TBPMO_FORM_VIEWTableAdapter.Name" xml:space="preserve">
     <value>TBPMO_FORM_VIEWTableAdapter</value>
   </data>
   <data name="&gt;&gt;TBPMO_FORM_VIEWTableAdapter.Type" xml:space="preserve">
-    <value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_VIEWTableAdapter, DD_DMSDataSet1.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_VIEWTableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;TBPMO_FORM_TYPEBindingSource.Name" xml:space="preserve">
     <value>TBPMO_FORM_TYPEBindingSource</value>
@@ -1909,7 +1708,7 @@ welches die links dargestellte TreeView-Struktur umsetzt.</value>
     <value>TBPMO_FORM_TYPETableAdapter</value>
   </data>
   <data name="&gt;&gt;TBPMO_FORM_TYPETableAdapter.Type" xml:space="preserve">
-    <value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_TYPETableAdapter, DD_DMSDataSet1.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBPMO_FORM_TYPETableAdapter, DD_DMSDataSet.Designer.vb, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmEntities</value>

app/DD-Record-Organiser/frmEntities.vb

@@ -123,11 +123,10 @@ Public Class frmEntities
 
             Me.btnGenerate.Visible = True
 
-
             If PARENT_IDTextBox.Text = 0 And (ComboBox1.SelectedValue = 1 Or ComboBox1.SelectedValue = 4) Then
                 Me.btnGenerate.Visible = True
             Else
-                btnGenerate.Visible = False
+                Me.btnGenerate.Visible = False
             End If
         Catch ex As Exception
             MsgBox("Error in Load_Forms:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
@@ -190,7 +189,7 @@ Public Class frmEntities
         DD_DMSDataSet.TBPMO_FORM_VIEW.ADDED_WHOColumn.DefaultValue = Environment.UserName
         DD_DMSDataSet.TBPMO_FORM.SHOW_FORM_CONSTRUCTColumn.DefaultValue = True
         DD_DMSDataSet.TBPMO_FORM.SINGLE_RECORDColumn.DefaultValue = False
-        Me.GroupBox1.Visible = True
+        'Me.GroupBox1.Visible = True
         insert = True
     End Sub
     Private Sub SaveLayout()
@@ -261,7 +260,7 @@ Public Class frmEntities
             Else
                 Me.TBPMO_FORM_VIEWBindingSource.EndEdit()
                 If DD_DMSDataSet.TBPMO_FORM_VIEW.GetChanges Is Nothing = False Then
-                    Me.CHANGED_WHOTextBoxPMOFormView.Text = Environment.UserName
+                    'Me.CHANGED_WHOTextBoxPMOFormView.Text = Environment.UserName
                     Me.TBPMO_FORM_VIEWBindingSource.EndEdit()
                     TBPMO_FORM_VIEWTableAdapter.Update(DD_DMSDataSet.TBPMO_FORM_VIEW)
                     changes = True

app/DD-Record-Organiser/frmGoogle.Designer.vb

@@ -23,16 +23,16 @@ Partial Class frmGoogle
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
-        Dim ImageTilesLayer2 As DevExpress.XtraMap.ImageTilesLayer = New DevExpress.XtraMap.ImageTilesLayer()
+        Dim ImageTilesLayer1 As DevExpress.XtraMap.ImageTilesLayer = New DevExpress.XtraMap.ImageTilesLayer()
-        Dim BingMapDataProvider2 As DevExpress.XtraMap.BingMapDataProvider = New DevExpress.XtraMap.BingMapDataProvider()
+        Dim BingMapDataProvider1 As DevExpress.XtraMap.BingMapDataProvider = New DevExpress.XtraMap.BingMapDataProvider()
-        Dim InformationLayer2 As DevExpress.XtraMap.InformationLayer = New DevExpress.XtraMap.InformationLayer()
+        Dim InformationLayer1 As DevExpress.XtraMap.InformationLayer = New DevExpress.XtraMap.InformationLayer()
-        Dim BingSearchDataProvider2 As DevExpress.XtraMap.BingSearchDataProvider = New DevExpress.XtraMap.BingSearchDataProvider()
+        Dim BingSearchDataProvider1 As DevExpress.XtraMap.BingSearchDataProvider = New DevExpress.XtraMap.BingSearchDataProvider()
-        Dim VectorItemsLayer2 As DevExpress.XtraMap.VectorItemsLayer = New DevExpress.XtraMap.VectorItemsLayer()
+        Dim VectorItemsLayer1 As DevExpress.XtraMap.VectorItemsLayer = New DevExpress.XtraMap.VectorItemsLayer()
-        Dim MapItemStorage2 As DevExpress.XtraMap.MapItemStorage = New DevExpress.XtraMap.MapItemStorage()
+        Dim MapItemStorage1 As DevExpress.XtraMap.MapItemStorage = New DevExpress.XtraMap.MapItemStorage()
         Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
         Me.MapControl1 = New DevExpress.XtraMap.MapControl()
-        Me.ListBox1 = New System.Windows.Forms.ListBox()
         Me.ToolTipController1 = New DevExpress.Utils.ToolTipController(Me.components)
+        Me.ListBox1 = New System.Windows.Forms.ListBox()
         CType(Me.MapControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
@@ -43,22 +43,22 @@ Partial Class frmGoogle
         '
         'MapControl1
         '
-        Me.MapControl1.CenterPoint = New DevExpress.XtraMap.GeoPoint(45.0R, 16.0R)
+        Me.MapControl1.CenterPoint = New DevExpress.XtraMap.GeoPoint(50.7R, 8.6R)
-        BingMapDataProvider2.BingKey = "hQUTlqLLK70bETnonpfi~0jx1pIAq1yQ7gXqbIyzKrg~Au-Tewbty8afAxdbNilSv4JlU7qwU-fQKu0ou" & _
+        BingMapDataProvider1.BingKey = "hQUTlqLLK70bETnonpfi~0jx1pIAq1yQ7gXqbIyzKrg~Au-Tewbty8afAxdbNilSv4JlU7qwU-fQKu0ou" & _
     "H9e1uJmpIyVdA3jugVEWMdy1Rbt"
-        BingMapDataProvider2.Kind = DevExpress.XtraMap.BingMapKind.Road
+        BingMapDataProvider1.Kind = DevExpress.XtraMap.BingMapKind.Road
-        BingMapDataProvider2.TileSource = Nothing
+        BingMapDataProvider1.TileSource = Nothing
-        ImageTilesLayer2.DataProvider = BingMapDataProvider2
+        ImageTilesLayer1.DataProvider = BingMapDataProvider1
-        ImageTilesLayer2.Name = "ImageLayer"
+        ImageTilesLayer1.Name = "ImageLayer"
-        BingSearchDataProvider2.BingKey = "hQUTlqLLK70bETnonpfi~0jx1pIAq1yQ7gXqbIyzKrg~Au-Tewbty8afAxdbNilSv4JlU7qwU-fQKu0ou" & _
+        BingSearchDataProvider1.BingKey = "hQUTlqLLK70bETnonpfi~0jx1pIAq1yQ7gXqbIyzKrg~Au-Tewbty8afAxdbNilSv4JlU7qwU-fQKu0ou" & _
     "H9e1uJmpIyVdA3jugVEWMdy1Rbt"
-        InformationLayer2.DataProvider = BingSearchDataProvider2
+        InformationLayer1.DataProvider = BingSearchDataProvider1
-        InformationLayer2.Name = "SearchLayer"
+        InformationLayer1.Name = "SearchLayer"
-        VectorItemsLayer2.Data = MapItemStorage2
+        VectorItemsLayer1.Data = MapItemStorage1
-        VectorItemsLayer2.Name = "VectorLayer"
+        VectorItemsLayer1.Name = "VectorLayer"
-        Me.MapControl1.Layers.Add(ImageTilesLayer2)
+        Me.MapControl1.Layers.Add(ImageTilesLayer1)
-        Me.MapControl1.Layers.Add(InformationLayer2)
+        Me.MapControl1.Layers.Add(InformationLayer1)
-        Me.MapControl1.Layers.Add(VectorItemsLayer2)
+        Me.MapControl1.Layers.Add(VectorItemsLayer1)
         Me.MapControl1.Location = New System.Drawing.Point(200, 2)
         Me.MapControl1.Name = "MapControl1"
         Me.MapControl1.Size = New System.Drawing.Size(1188, 485)
@@ -66,6 +66,12 @@ Partial Class frmGoogle
         Me.MapControl1.ToolTipController = Me.ToolTipController1
         Me.MapControl1.ZoomLevel = 10.0R
         '
+        'ToolTipController1
+        '
+        Me.ToolTipController1.Rounded = True
+        Me.ToolTipController1.ToolTipStyle = DevExpress.Utils.ToolTipStyle.WindowsXP
+        Me.ToolTipController1.ToolTipType = DevExpress.Utils.ToolTipType.SuperTip
+        '
         'ListBox1
         '
         Me.ListBox1.FormattingEnabled = True
@@ -74,12 +80,6 @@ Partial Class frmGoogle
         Me.ListBox1.Size = New System.Drawing.Size(191, 485)
         Me.ListBox1.TabIndex = 7
         '
-        'ToolTipController1
-        '
-        Me.ToolTipController1.Rounded = True
-        Me.ToolTipController1.ToolTipStyle = DevExpress.Utils.ToolTipStyle.WindowsXP
-        Me.ToolTipController1.ToolTipType = DevExpress.Utils.ToolTipType.SuperTip
-        '
         'frmGoogle
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)

app/DD-Record-Organiser/frmGoogle.vb

@@ -5,6 +5,11 @@ Imports DevExpress.Map
 
 Public Class frmGoogle
 
+    Public Sub New()
+        InitializeComponent()
+
+        mapControl1.SetMapItemFactory(New MapItemFactory())
+    End Sub
 
     '##################### SEARCH ##############################
     'Private ReadOnly Property SearchLayer() As InformationLayer
@@ -27,17 +32,16 @@ Public Class frmGoogle
         End Get
     End Property
 
-    Private ReadOnly Property ItemStorage() As MapItemStorage
+    'Private Property ItemStorage() As MapItemStorage
-        Get
+    '    Get
-            Return CType(VectorLayer.Data, MapItemStorage)
+    '        Return CType(VectorLayer.Data, MapItemStorage)
-        End Get
+    '    End Get
-    End Property
+    'End Property
 
 
     Private Sub frmGoogle_Load(sender As Object, e As EventArgs) Handles Me.Load
-        'Events
-        AddHandler MapControl1.MapItemClick, AddressOf MapControl1_MapItemClick
 
+        Dim items As New List(Of MapPushpin)
 
         MapControl1.ShowToolTips = True
         MapControl1.SetMapItemFactory(New MapItemFactory())
@@ -61,21 +65,28 @@ Public Class frmGoogle
             pushpin.Location = New GeoPoint(lat, lon)
             pushpin.Text = row.Item("Record-ID")
             pushpin.Information = row
-
+            pushpin.TextColor = Color.Aqua
 
             pushpin.Attributes.Add(New MapItemAttribute() With {.Name = "SNumber", .Type = GetType(String), .Value = row.Item("Supplier_number")})
             pushpin.Attributes.Add(New MapItemAttribute() With {.Name = "SName", .Type = GetType(String), .Value = row.Item("Supplier_name")})
 
             pushpin.ToolTipPattern = "Supplier Name: {SName} - Supplier Number: {SNumber}"
-            ItemStorage.Items.Add(pushpin)
+
+            items.Add(pushpin)
 
             lat += 0.01
             lon += 0.01
         Next
 
+        Dim storage As New MapItemStorage()
+        Dim itemArray() As MapPushpin = items.ToArray()
+
+        storage.Items.AddRange(itemArray)
+        VectorLayer.Data = storage
+
     End Sub
 
-    Private Sub MapControl1_MapItemClick(sender As Object, e As MapItemClickEventArgs)
+    Private Sub MapControl1_MapItemClick(sender As Object, e As MapItemClickEventArgs) Handles MapControl1.MapItemClick
         Dim item As MapPushpin = e.Item
         Dim row As DataRow = item.Information
         Dim attrs As MapItemAttributeCollection = item.Attributes
@@ -88,13 +99,11 @@ Public Class frmGoogle
     End Sub
 
     Private Sub MapControl1_DrawMapItem(sender As Object, e As DrawMapItemEventArgs) Handles MapControl1.DrawMapItem
-        Dim colorOuter As Color = Color.White
+        Dim colorOuter As Color = Color.Green
-        Dim colorInner As Color = Color.Blue
+        Dim colorInner As Color = Color.Green
         Dim colorInnerHighlight As Color = Color.Red
 
-        e.Fill = If(e.IsSelected Or e.IsHighlighted, colorInnerHighlight, colorInner)
+        e.Fill = Color.Red
-        e.Stroke = colorOuter
-        e.StrokeWidth = If(e.IsSelected, 5, 2)
     End Sub
 
     Public Class MapItemFactory

app/DD-Record-Organiser/frmRecOrgConfig_Basic.resx

@@ -343,13 +343,13 @@
     <value>9, 80</value>
   </data>
   <data name="Label9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>80, 13</value>
+    <value>84, 13</value>
   </data>
   <data name="Label9.TabIndex" type="System.Int32, mscorlib">
     <value>9</value>
   </data>
   <data name="Label9.Text" xml:space="preserve">
-    <value>WIKI Network:</value>
+    <value>WIKI Hilfe Link:</value>
   </data>
   <data name="&gt;&gt;Label9.Name" xml:space="preserve">
     <value>Label9</value>
@@ -785,7 +785,7 @@
     <value>83</value>
   </data>
   <data name="GroupBox5.Text" xml:space="preserve">
-    <value>Userautentifizierung windream Rechte:</value>
+    <value>Userauthentifizierung windream Rechte:</value>
   </data>
   <data name="&gt;&gt;GroupBox5.Name" xml:space="preserve">
     <value>GroupBox5</value>
@@ -1106,7 +1106,7 @@
 </value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Grundeinstellungen Record Organizer</value>
+    <value>Basiseinstellungen</value>
   </data>
   <data name="&gt;&gt;OpenFileDialog1.Name" xml:space="preserve">
     <value>OpenFileDialog1</value>

app/DD-Record-Organiser/frmUserKonfig.Designer.vb

@@ -62,7 +62,6 @@ Partial Class frmUserKonfig
         Me.TBDD_USERBindingNavigator = New System.Windows.Forms.BindingNavigator(Me.components)
         Me.BindingNavigatorAddNewItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorCountItem = New System.Windows.Forms.ToolStripLabel()
-        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMoveFirstItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMovePreviousItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator = New System.Windows.Forms.ToolStripSeparator()
@@ -71,6 +70,7 @@ Partial Class frmUserKonfig
         Me.BindingNavigatorMoveNextItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorMoveLastItem = New System.Windows.Forms.ToolStripButton()
         Me.BindingNavigatorSeparator2 = New System.Windows.Forms.ToolStripSeparator()
+        Me.BindingNavigatorDeleteItem = New System.Windows.Forms.ToolStripButton()
         Me.TBDD_USERBindingNavigatorSaveItem = New System.Windows.Forms.ToolStripButton()
         Me.tbRefreshUsers = New System.Windows.Forms.ToolStripButton()
         Me.tsAddUser = New System.Windows.Forms.ToolStripButton()
@@ -521,12 +521,6 @@ Partial Class frmUserKonfig
         Me.BindingNavigatorCountItem.Name = "BindingNavigatorCountItem"
         resources.ApplyResources(Me.BindingNavigatorCountItem, "BindingNavigatorCountItem")
         '
-        'BindingNavigatorDeleteItem
-        '
-        Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
-        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
-        Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
-        '
         'BindingNavigatorMoveFirstItem
         '
         Me.BindingNavigatorMoveFirstItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
@@ -571,6 +565,12 @@ Partial Class frmUserKonfig
         Me.BindingNavigatorSeparator2.Name = "BindingNavigatorSeparator2"
         resources.ApplyResources(Me.BindingNavigatorSeparator2, "BindingNavigatorSeparator2")
         '
+        'BindingNavigatorDeleteItem
+        '
+        Me.BindingNavigatorDeleteItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image
+        resources.ApplyResources(Me.BindingNavigatorDeleteItem, "BindingNavigatorDeleteItem")
+        Me.BindingNavigatorDeleteItem.Name = "BindingNavigatorDeleteItem"
+        '
         'TBDD_USERBindingNavigatorSaveItem
         '
         Me.TBDD_USERBindingNavigatorSaveItem.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image

app/DD-Record-Organiser/frmUserKonfig.resx

@@ -1284,10 +1284,10 @@
     <value>Magenta</value>
   </data>
   <data name="tsAddUser.Size" type="System.Drawing.Size, System.Drawing">
-    <value>176, 22</value>
+    <value>241, 22</value>
   </data>
   <data name="tsAddUser.Text" xml:space="preserve">
-    <value>Benutzer aus AD hinzufügen</value>
+    <value>Benutzer aus ActiveDirectory hinzufügen</value>
   </data>
   <data name="TBDD_USERBindingNavigator.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
@@ -1625,6 +1625,327 @@
   <data name="XtraTabPage1.AutoScroll" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>109, 13</value>
+  </data>
+  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="Label1.Text" xml:space="preserve">
+    <value>Verfügbare Gruppen:</value>
+  </data>
+  <data name="&gt;&gt;Label1.Name" xml:space="preserve">
+    <value>Label1</value>
+  </data>
+  <data name="&gt;&gt;Label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label1.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnRemoveUserFromGroup.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="btnRemoveUserFromGroup.Location" type="System.Drawing.Point, System.Drawing">
+    <value>382, 37</value>
+  </data>
+  <data name="btnRemoveUserFromGroup.Size" type="System.Drawing.Size, System.Drawing">
+    <value>321, 23</value>
+  </data>
+  <data name="btnRemoveUserFromGroup.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="btnRemoveUserFromGroup.Text" xml:space="preserve">
+    <value>Benutzer aus Gruppe entfernen</value>
+  </data>
+  <data name="&gt;&gt;btnRemoveUserFromGroup.Name" xml:space="preserve">
+    <value>btnRemoveUserFromGroup</value>
+  </data>
+  <data name="&gt;&gt;btnRemoveUserFromGroup.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;btnRemoveUserFromGroup.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;btnRemoveUserFromGroup.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <metadata name="TBDD_USER_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>929, 17</value>
+  </metadata>
+  <data name="cmbGroup.Location" type="System.Drawing.Point, System.Drawing">
+    <value>140, 10</value>
+  </data>
+  <data name="cmbGroup.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 21</value>
+  </data>
+  <data name="cmbGroup.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;cmbGroup.Name" xml:space="preserve">
+    <value>cmbGroup</value>
+  </data>
+  <data name="&gt;&gt;cmbGroup.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbGroup.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;cmbGroup.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 40</value>
+  </data>
+  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>118, 13</value>
+  </data>
+  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="Label2.Text" xml:space="preserve">
+    <value>Zugewiesene Gruppen:</value>
+  </data>
+  <data name="&gt;&gt;Label2.Name" xml:space="preserve">
+    <value>Label2</value>
+  </data>
+  <data name="&gt;&gt;Label2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label2.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="btnAddUserToGroup.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="btnAddUserToGroup.Location" type="System.Drawing.Point, System.Drawing">
+    <value>382, 8</value>
+  </data>
+  <data name="btnAddUserToGroup.Size" type="System.Drawing.Size, System.Drawing">
+    <value>321, 23</value>
+  </data>
+  <data name="btnAddUserToGroup.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="btnAddUserToGroup.Text" xml:space="preserve">
+    <value>Ausgewählten Benutzer zu Gruppe hinzufügen</value>
+  </data>
+  <data name="&gt;&gt;btnAddUserToGroup.Name" xml:space="preserve">
+    <value>btnAddUserToGroup</value>
+  </data>
+  <data name="&gt;&gt;btnAddUserToGroup.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;btnAddUserToGroup.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;btnAddUserToGroup.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="lbGroups.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left</value>
+  </data>
+  <data name="lbGroups.Location" type="System.Drawing.Point, System.Drawing">
+    <value>140, 40</value>
+  </data>
+  <data name="lbGroups.Size" type="System.Drawing.Size, System.Drawing">
+    <value>236, 212</value>
+  </data>
+  <data name="lbGroups.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;lbGroups.Name" xml:space="preserve">
+    <value>lbGroups</value>
+  </data>
+  <data name="&gt;&gt;lbGroups.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lbGroups.Parent" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;lbGroups.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="TabPage1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 22</value>
+  </data>
+  <data name="TabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1101, 296</value>
+  </data>
+  <data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="TabPage1.Text" xml:space="preserve">
+    <value>User zu Gruppe</value>
+  </data>
+  <data name="&gt;&gt;TabPage1.Name" xml:space="preserve">
+    <value>TabPage1</value>
+  </data>
+  <data name="&gt;&gt;TabPage1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TabPage1.Parent" xml:space="preserve">
+    <value>TabControl1</value>
+  </data>
+  <data name="&gt;&gt;TabPage1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="TabPage2.AutoScroll" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;GridControlWH_Users1.Name" xml:space="preserve">
+    <value>GridControlWH_Users1</value>
+  </data>
+  <data name="&gt;&gt;GridControlWH_Users1.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;GridControlWH_Users1.Parent" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;GridControlWH_Users1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;GridControlUsers2Group.Name" xml:space="preserve">
+    <value>GridControlUsers2Group</value>
+  </data>
+  <data name="&gt;&gt;GridControlUsers2Group.Type" xml:space="preserve">
+    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="&gt;&gt;GridControlUsers2Group.Parent" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;GridControlUsers2Group.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;btndeleteUserfromGroup.Name" xml:space="preserve">
+    <value>btndeleteUserfromGroup</value>
+  </data>
+  <data name="&gt;&gt;btndeleteUserfromGroup.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;btndeleteUserfromGroup.Parent" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;btndeleteUserfromGroup.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;lblUserforGroup.Name" xml:space="preserve">
+    <value>lblUserforGroup</value>
+  </data>
+  <data name="&gt;&gt;lblUserforGroup.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;lblUserforGroup.Parent" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;lblUserforGroup.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;btnaddSelectedUser2Group.Name" xml:space="preserve">
+    <value>btnaddSelectedUser2Group</value>
+  </data>
+  <data name="&gt;&gt;btnaddSelectedUser2Group.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;btnaddSelectedUser2Group.Parent" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;btnaddSelectedUser2Group.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;Label4.Name" xml:space="preserve">
+    <value>Label4</value>
+  </data>
+  <data name="&gt;&gt;Label4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label4.Parent" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;Label3.Name" xml:space="preserve">
+    <value>Label3</value>
+  </data>
+  <data name="&gt;&gt;Label3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Label3.Parent" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;cmbGroups_Group2User.Name" xml:space="preserve">
+    <value>cmbGroups_Group2User</value>
+  </data>
+  <data name="&gt;&gt;cmbGroups_Group2User.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbGroups_Group2User.Parent" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;cmbGroups_Group2User.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="TabPage2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>4, 22</value>
+  </data>
+  <data name="TabPage2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>3, 3, 3, 3</value>
+  </data>
+  <data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1097, 293</value>
+  </data>
+  <data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="TabPage2.Text" xml:space="preserve">
+    <value>Gruppe zu Usern</value>
+  </data>
+  <data name="&gt;&gt;TabPage2.Name" xml:space="preserve">
+    <value>TabPage2</value>
+  </data>
+  <data name="&gt;&gt;TabPage2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TabPage2.Parent" xml:space="preserve">
+    <value>TabControl1</value>
+  </data>
+  <data name="&gt;&gt;TabPage2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="TabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="TabControl1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1109, 322</value>
+  </data>
+  <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
   <data name="&gt;&gt;TabControl1.Name" xml:space="preserve">
     <value>TabControl1</value>
   </data>
@@ -1835,438 +2156,9 @@
   <data name="&gt;&gt;XtraTabControl1.ZOrder" xml:space="preserve">
     <value>13</value>
   </data>
-  <data name="&gt;&gt;TabPage1.Name" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;TabPage1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TabPage1.Parent" xml:space="preserve">
-    <value>TabControl1</value>
-  </data>
-  <data name="&gt;&gt;TabPage1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;TabPage2.Name" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;TabPage2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TabPage2.Parent" xml:space="preserve">
-    <value>TabControl1</value>
-  </data>
-  <data name="&gt;&gt;TabPage2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="TabControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="TabControl1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="TabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1109, 322</value>
-  </data>
-  <data name="TabControl1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.Name" xml:space="preserve">
-    <value>TabControl1</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.Parent" xml:space="preserve">
-    <value>XtraTabPage1</value>
-  </data>
-  <data name="&gt;&gt;TabControl1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;Label1.Name" xml:space="preserve">
-    <value>Label1</value>
-  </data>
-  <data name="&gt;&gt;Label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label1.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;btnRemoveUserFromGroup.Name" xml:space="preserve">
-    <value>btnRemoveUserFromGroup</value>
-  </data>
-  <data name="&gt;&gt;btnRemoveUserFromGroup.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;btnRemoveUserFromGroup.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;btnRemoveUserFromGroup.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;cmbGroup.Name" xml:space="preserve">
-    <value>cmbGroup</value>
-  </data>
-  <data name="&gt;&gt;cmbGroup.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbGroup.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;cmbGroup.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;Label2.Name" xml:space="preserve">
-    <value>Label2</value>
-  </data>
-  <data name="&gt;&gt;Label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label2.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;btnAddUserToGroup.Name" xml:space="preserve">
-    <value>btnAddUserToGroup</value>
-  </data>
-  <data name="&gt;&gt;btnAddUserToGroup.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;btnAddUserToGroup.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;btnAddUserToGroup.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;lbGroups.Name" xml:space="preserve">
-    <value>lbGroups</value>
-  </data>
-  <data name="&gt;&gt;lbGroups.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lbGroups.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;lbGroups.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="TabPage1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
-  </data>
-  <data name="TabPage1.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 3</value>
-  </data>
-  <data name="TabPage1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1101, 296</value>
-  </data>
-  <data name="TabPage1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="TabPage1.Text" xml:space="preserve">
-    <value>User zu Gruppe</value>
-  </data>
-  <data name="&gt;&gt;TabPage1.Name" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;TabPage1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TabPage1.Parent" xml:space="preserve">
-    <value>TabControl1</value>
-  </data>
-  <data name="&gt;&gt;TabPage1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="Label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="Label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>109, 13</value>
-  </data>
-  <data name="Label1.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="Label1.Text" xml:space="preserve">
-    <value>Verfügbare Gruppen:</value>
-  </data>
-  <data name="&gt;&gt;Label1.Name" xml:space="preserve">
-    <value>Label1</value>
-  </data>
-  <data name="&gt;&gt;Label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label1.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="btnRemoveUserFromGroup.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
-  <data name="btnRemoveUserFromGroup.Location" type="System.Drawing.Point, System.Drawing">
-    <value>382, 37</value>
-  </data>
-  <data name="btnRemoveUserFromGroup.Size" type="System.Drawing.Size, System.Drawing">
-    <value>321, 23</value>
-  </data>
-  <data name="btnRemoveUserFromGroup.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="btnRemoveUserFromGroup.Text" xml:space="preserve">
-    <value>Benutzer aus Gruppe entfernen</value>
-  </data>
-  <data name="&gt;&gt;btnRemoveUserFromGroup.Name" xml:space="preserve">
-    <value>btnRemoveUserFromGroup</value>
-  </data>
-  <data name="&gt;&gt;btnRemoveUserFromGroup.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;btnRemoveUserFromGroup.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;btnRemoveUserFromGroup.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
   <metadata name="TBDD_USER_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>929, 17</value>
   </metadata>
-  <data name="cmbGroup.Location" type="System.Drawing.Point, System.Drawing">
-    <value>140, 10</value>
-  </data>
-  <data name="cmbGroup.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 21</value>
-  </data>
-  <data name="cmbGroup.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;cmbGroup.Name" xml:space="preserve">
-    <value>cmbGroup</value>
-  </data>
-  <data name="&gt;&gt;cmbGroup.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbGroup.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;cmbGroup.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <metadata name="TBDD_USER_GROUPSBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>929, 17</value>
-  </metadata>
-  <data name="Label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 40</value>
-  </data>
-  <data name="Label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>118, 13</value>
-  </data>
-  <data name="Label2.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
-  </data>
-  <data name="Label2.Text" xml:space="preserve">
-    <value>Zugewiesene Gruppen:</value>
-  </data>
-  <data name="&gt;&gt;Label2.Name" xml:space="preserve">
-    <value>Label2</value>
-  </data>
-  <data name="&gt;&gt;Label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label2.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;Label2.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="btnAddUserToGroup.ImageAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
-  <data name="btnAddUserToGroup.Location" type="System.Drawing.Point, System.Drawing">
-    <value>382, 8</value>
-  </data>
-  <data name="btnAddUserToGroup.Size" type="System.Drawing.Size, System.Drawing">
-    <value>321, 23</value>
-  </data>
-  <data name="btnAddUserToGroup.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="btnAddUserToGroup.Text" xml:space="preserve">
-    <value>Ausgewählten Benutzer zu Gruppe hinzufügen</value>
-  </data>
-  <data name="&gt;&gt;btnAddUserToGroup.Name" xml:space="preserve">
-    <value>btnAddUserToGroup</value>
-  </data>
-  <data name="&gt;&gt;btnAddUserToGroup.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;btnAddUserToGroup.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;btnAddUserToGroup.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="lbGroups.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left</value>
-  </data>
-  <data name="lbGroups.Location" type="System.Drawing.Point, System.Drawing">
-    <value>140, 40</value>
-  </data>
-  <data name="lbGroups.Size" type="System.Drawing.Size, System.Drawing">
-    <value>236, 225</value>
-  </data>
-  <data name="lbGroups.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;lbGroups.Name" xml:space="preserve">
-    <value>lbGroups</value>
-  </data>
-  <data name="&gt;&gt;lbGroups.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lbGroups.Parent" xml:space="preserve">
-    <value>TabPage1</value>
-  </data>
-  <data name="&gt;&gt;lbGroups.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="TabPage2.AutoScroll" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;GridControlWH_Users1.Name" xml:space="preserve">
-    <value>GridControlWH_Users1</value>
-  </data>
-  <data name="&gt;&gt;GridControlWH_Users1.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;GridControlWH_Users1.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;GridControlWH_Users1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;GridControlUsers2Group.Name" xml:space="preserve">
-    <value>GridControlUsers2Group</value>
-  </data>
-  <data name="&gt;&gt;GridControlUsers2Group.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v15.2, Version=15.2.9.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;GridControlUsers2Group.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;GridControlUsers2Group.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;btndeleteUserfromGroup.Name" xml:space="preserve">
-    <value>btndeleteUserfromGroup</value>
-  </data>
-  <data name="&gt;&gt;btndeleteUserfromGroup.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;btndeleteUserfromGroup.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;btndeleteUserfromGroup.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;lblUserforGroup.Name" xml:space="preserve">
-    <value>lblUserforGroup</value>
-  </data>
-  <data name="&gt;&gt;lblUserforGroup.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;lblUserforGroup.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;lblUserforGroup.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;btnaddSelectedUser2Group.Name" xml:space="preserve">
-    <value>btnaddSelectedUser2Group</value>
-  </data>
-  <data name="&gt;&gt;btnaddSelectedUser2Group.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;btnaddSelectedUser2Group.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;btnaddSelectedUser2Group.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;Label4.Name" xml:space="preserve">
-    <value>Label4</value>
-  </data>
-  <data name="&gt;&gt;Label4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label4.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;Label4.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;Label3.Name" xml:space="preserve">
-    <value>Label3</value>
-  </data>
-  <data name="&gt;&gt;Label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;Label3.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;Label3.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;cmbGroups_Group2User.Name" xml:space="preserve">
-    <value>cmbGroups_Group2User</value>
-  </data>
-  <data name="&gt;&gt;cmbGroups_Group2User.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbGroups_Group2User.Parent" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;cmbGroups_Group2User.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="TabPage2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
-  </data>
-  <data name="TabPage2.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>3, 3, 3, 3</value>
-  </data>
-  <data name="TabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1097, 293</value>
-  </data>
-  <data name="TabPage2.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="TabPage2.Text" xml:space="preserve">
-    <value>Gruppe zu Usern</value>
-  </data>
-  <data name="&gt;&gt;TabPage2.Name" xml:space="preserve">
-    <value>TabPage2</value>
-  </data>
-  <data name="&gt;&gt;TabPage2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;TabPage2.Parent" xml:space="preserve">
-    <value>TabControl1</value>
-  </data>
-  <data name="&gt;&gt;TabPage2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
   <data name="GridControlWH_Users1.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left</value>
   </data>
@@ -4849,12 +4741,6 @@ Mandant hinzufügen</value>
   <data name="&gt;&gt;BindingNavigatorCountItem.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;BindingNavigatorDeleteItem.Name" xml:space="preserve">
-    <value>BindingNavigatorDeleteItem</value>
-  </data>
-  <data name="&gt;&gt;BindingNavigatorDeleteItem.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;BindingNavigatorMoveFirstItem.Name" xml:space="preserve">
     <value>BindingNavigatorMoveFirstItem</value>
   </data>
@@ -4903,6 +4789,12 @@ Mandant hinzufügen</value>
   <data name="&gt;&gt;BindingNavigatorSeparator2.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;BindingNavigatorDeleteItem.Name" xml:space="preserve">
+    <value>BindingNavigatorDeleteItem</value>
+  </data>
+  <data name="&gt;&gt;BindingNavigatorDeleteItem.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripButton, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;TBDD_USERBindingNavigatorSaveItem.Name" xml:space="preserve">
     <value>TBDD_USERBindingNavigatorSaveItem</value>
   </data>

app/DD-Record-Organiser/frmUserKonfig_AddUsers.Designer.vb

@@ -63,56 +63,35 @@ Partial Class frmUserKonfig_AddUsers
         'SplitContainer1
         '
         resources.ApplyResources(Me.SplitContainer1, "SplitContainer1")
-        Me.ToolTipController1.SetAllowHtmlText(Me.SplitContainer1, CType(resources.GetObject("SplitContainer1.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.SplitContainer1.Name = "SplitContainer1"
         '
         'SplitContainer1.Panel1
         '
         resources.ApplyResources(Me.SplitContainer1.Panel1, "SplitContainer1.Panel1")
-        Me.ToolTipController1.SetAllowHtmlText(Me.SplitContainer1.Panel1, CType(resources.GetObject("SplitContainer1.Panel1.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.SplitContainer1.Panel1.Controls.Add(Me.lbGroups)
         Me.SplitContainer1.Panel1.Controls.Add(Me.ToolStrip1)
-        Me.ToolTipController1.SetTitle(Me.SplitContainer1.Panel1, resources.GetString("SplitContainer1.Panel1.Title"))
-        Me.ToolTipController1.SetToolTip(Me.SplitContainer1.Panel1, resources.GetString("SplitContainer1.Panel1.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.SplitContainer1.Panel1, CType(resources.GetObject("SplitContainer1.Panel1.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         '
         'SplitContainer1.Panel2
         '
-        resources.ApplyResources(Me.SplitContainer1.Panel2, "SplitContainer1.Panel2")
-        Me.ToolTipController1.SetAllowHtmlText(Me.SplitContainer1.Panel2, CType(resources.GetObject("SplitContainer1.Panel2.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.SplitContainer1.Panel2.Controls.Add(Me.GridControlUsers)
         Me.SplitContainer1.Panel2.Controls.Add(Me.GroupBox1)
         Me.SplitContainer1.Panel2.Controls.Add(Me.ToolStrip2)
         Me.SplitContainer1.Panel2.Controls.Add(Me.btnCancel)
         Me.SplitContainer1.Panel2.Controls.Add(Me.btnAddUsers)
-        Me.ToolTipController1.SetTitle(Me.SplitContainer1.Panel2, resources.GetString("SplitContainer1.Panel2.Title"))
-        Me.ToolTipController1.SetToolTip(Me.SplitContainer1.Panel2, resources.GetString("SplitContainer1.Panel2.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.SplitContainer1.Panel2, CType(resources.GetObject("SplitContainer1.Panel2.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
-        Me.ToolTipController1.SetTitle(Me.SplitContainer1, resources.GetString("SplitContainer1.Title"))
-        Me.ToolTipController1.SetToolTip(Me.SplitContainer1, resources.GetString("SplitContainer1.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.SplitContainer1, CType(resources.GetObject("SplitContainer1.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         '
         'lbGroups
         '
-        resources.ApplyResources(Me.lbGroups, "lbGroups")
-        Me.ToolTipController1.SetAllowHtmlText(Me.lbGroups, CType(resources.GetObject("lbGroups.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.lbGroups.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
+        resources.ApplyResources(Me.lbGroups, "lbGroups")
         Me.lbGroups.FormattingEnabled = True
         Me.lbGroups.Name = "lbGroups"
-        Me.ToolTipController1.SetTitle(Me.lbGroups, resources.GetString("lbGroups.Title"))
-        Me.ToolTipController1.SetToolTip(Me.lbGroups, resources.GetString("lbGroups.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.lbGroups, CType(resources.GetObject("lbGroups.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         '
         'ToolStrip1
         '
-        resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
-        Me.ToolTipController1.SetAllowHtmlText(Me.ToolStrip1, CType(resources.GetObject("ToolStrip1.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.ToolStrip1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
         Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabel1})
+        resources.ApplyResources(Me.ToolStrip1, "ToolStrip1")
         Me.ToolStrip1.Name = "ToolStrip1"
-        Me.ToolTipController1.SetTitle(Me.ToolStrip1, resources.GetString("ToolStrip1.Title"))
-        Me.ToolTipController1.SetToolTip(Me.ToolStrip1, resources.GetString("ToolStrip1.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.ToolStrip1, CType(resources.GetObject("ToolStrip1.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         '
         'ToolStripLabel1
         '
@@ -123,18 +102,6 @@ Partial Class frmUserKonfig_AddUsers
         '
         resources.ApplyResources(Me.GridControlUsers, "GridControlUsers")
         Me.GridControlUsers.DataSource = Me.TBAD_UsersBindingSource
-        Me.GridControlUsers.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridControlUsers.EmbeddedNavigator.AccessibleDescription")
-        Me.GridControlUsers.EmbeddedNavigator.AccessibleName = resources.GetString("GridControlUsers.EmbeddedNavigator.AccessibleName")
-        Me.GridControlUsers.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridControlUsers.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
-        Me.GridControlUsers.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridControlUsers.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridControlUsers.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridControlUsers.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
-        Me.GridControlUsers.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridControlUsers.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
-        Me.GridControlUsers.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridControlUsers.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridControlUsers.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridControlUsers.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
-        Me.GridControlUsers.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridControlUsers.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridControlUsers.EmbeddedNavigator.ToolTip = resources.GetString("GridControlUsers.EmbeddedNavigator.ToolTip")
-        Me.GridControlUsers.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridControlUsers.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridControlUsers.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridControlUsers.EmbeddedNavigator.ToolTipTitle")
         Me.GridControlUsers.MainView = Me.GridViewUsers
         Me.GridControlUsers.Name = "GridControlUsers"
         Me.GridControlUsers.ShowOnlyPredefinedDetails = True
@@ -153,24 +120,15 @@ Partial Class frmUserKonfig_AddUsers
         'GridViewUsers
         '
         Me.GridViewUsers.Appearance.EvenRow.BackColor = CType(resources.GetObject("GridViewUsers.Appearance.EvenRow.BackColor"), System.Drawing.Color)
-        Me.GridViewUsers.Appearance.EvenRow.FontSizeDelta = CType(resources.GetObject("GridViewUsers.Appearance.EvenRow.FontSizeDelta"), Integer)
-        Me.GridViewUsers.Appearance.EvenRow.FontStyleDelta = CType(resources.GetObject("GridViewUsers.Appearance.EvenRow.FontStyleDelta"), System.Drawing.FontStyle)
-        Me.GridViewUsers.Appearance.EvenRow.GradientMode = CType(resources.GetObject("GridViewUsers.Appearance.EvenRow.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
-        Me.GridViewUsers.Appearance.EvenRow.Image = CType(resources.GetObject("GridViewUsers.Appearance.EvenRow.Image"), System.Drawing.Image)
         Me.GridViewUsers.Appearance.EvenRow.Options.UseBackColor = True
         Me.GridViewUsers.Appearance.FocusedRow.BackColor = CType(resources.GetObject("GridViewUsers.Appearance.FocusedRow.BackColor"), System.Drawing.Color)
-        Me.GridViewUsers.Appearance.FocusedRow.FontSizeDelta = CType(resources.GetObject("GridViewUsers.Appearance.FocusedRow.FontSizeDelta"), Integer)
-        Me.GridViewUsers.Appearance.FocusedRow.FontStyleDelta = CType(resources.GetObject("GridViewUsers.Appearance.FocusedRow.FontStyleDelta"), System.Drawing.FontStyle)
-        Me.GridViewUsers.Appearance.FocusedRow.GradientMode = CType(resources.GetObject("GridViewUsers.Appearance.FocusedRow.GradientMode"), System.Drawing.Drawing2D.LinearGradientMode)
-        Me.GridViewUsers.Appearance.FocusedRow.Image = CType(resources.GetObject("GridViewUsers.Appearance.FocusedRow.Image"), System.Drawing.Image)
         Me.GridViewUsers.Appearance.FocusedRow.Options.UseBackColor = True
-        resources.ApplyResources(Me.GridViewUsers, "GridViewUsers")
         Me.GridViewUsers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colSelect, Me.colUsername, Me.colPrename, Me.colSurname, Me.colEmail})
         Me.GridViewUsers.GridControl = Me.GridControlUsers
         Me.GridViewUsers.Name = "GridViewUsers"
         Me.GridViewUsers.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
         Me.GridViewUsers.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
-        Me.GridViewUsers.OptionsBehavior.CopyToClipboardWithColumnHeaders = False
+        Me.GridViewUsers.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
         Me.GridViewUsers.OptionsSelection.EnableAppearanceFocusedCell = False
         Me.GridViewUsers.OptionsView.ColumnAutoWidth = False
         Me.GridViewUsers.OptionsView.EnableAppearanceEvenRow = True
@@ -182,80 +140,63 @@ Partial Class frmUserKonfig_AddUsers
         resources.ApplyResources(Me.colSelect, "colSelect")
         Me.colSelect.FieldName = "Select"
         Me.colSelect.Name = "colSelect"
-        Me.colSelect.Summary.AddRange(New DevExpress.XtraGrid.GridSummaryItem() {New DevExpress.XtraGrid.GridColumnSummaryItem()})
         '
         'colUsername
         '
-        resources.ApplyResources(Me.colUsername, "colUsername")
         Me.colUsername.FieldName = "Username"
         Me.colUsername.Name = "colUsername"
         Me.colUsername.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.colUsername, "colUsername")
         '
         'colPrename
         '
-        resources.ApplyResources(Me.colPrename, "colPrename")
         Me.colPrename.FieldName = "Prename"
         Me.colPrename.Name = "colPrename"
         Me.colPrename.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.colPrename, "colPrename")
         '
         'colSurname
         '
-        resources.ApplyResources(Me.colSurname, "colSurname")
         Me.colSurname.FieldName = "Surname"
         Me.colSurname.Name = "colSurname"
         Me.colSurname.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.colSurname, "colSurname")
         '
         'colEmail
         '
-        resources.ApplyResources(Me.colEmail, "colEmail")
         Me.colEmail.FieldName = "Email"
         Me.colEmail.Name = "colEmail"
         Me.colEmail.OptionsColumn.AllowEdit = False
+        resources.ApplyResources(Me.colEmail, "colEmail")
         '
         'GroupBox1
         '
         resources.ApplyResources(Me.GroupBox1, "GroupBox1")
-        Me.ToolTipController1.SetAllowHtmlText(Me.GroupBox1, CType(resources.GetObject("GroupBox1.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.GroupBox1.Controls.Add(Me.RBCheck1)
         Me.GroupBox1.Controls.Add(Me.RBCheck2)
         Me.GroupBox1.Name = "GroupBox1"
         Me.GroupBox1.TabStop = False
-        Me.ToolTipController1.SetTitle(Me.GroupBox1, resources.GetString("GroupBox1.Title"))
-        Me.ToolTipController1.SetToolTip(Me.GroupBox1, resources.GetString("GroupBox1.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.GroupBox1, CType(resources.GetObject("GroupBox1.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         '
         'RBCheck1
         '
         resources.ApplyResources(Me.RBCheck1, "RBCheck1")
-        Me.ToolTipController1.SetAllowHtmlText(Me.RBCheck1, CType(resources.GetObject("RBCheck1.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.RBCheck1.Name = "RBCheck1"
-        Me.ToolTipController1.SetTitle(Me.RBCheck1, resources.GetString("RBCheck1.Title"))
-        Me.ToolTipController1.SetToolTip(Me.RBCheck1, resources.GetString("RBCheck1.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.RBCheck1, CType(resources.GetObject("RBCheck1.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         Me.RBCheck1.UseVisualStyleBackColor = True
         '
         'RBCheck2
         '
         resources.ApplyResources(Me.RBCheck2, "RBCheck2")
-        Me.ToolTipController1.SetAllowHtmlText(Me.RBCheck2, CType(resources.GetObject("RBCheck2.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.RBCheck2.Checked = True
         Me.RBCheck2.Name = "RBCheck2"
         Me.RBCheck2.TabStop = True
-        Me.ToolTipController1.SetTitle(Me.RBCheck2, resources.GetString("RBCheck2.Title"))
-        Me.ToolTipController1.SetToolTip(Me.RBCheck2, resources.GetString("RBCheck2.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.RBCheck2, CType(resources.GetObject("RBCheck2.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         Me.RBCheck2.UseVisualStyleBackColor = True
         '
         'ToolStrip2
         '
-        resources.ApplyResources(Me.ToolStrip2, "ToolStrip2")
-        Me.ToolTipController1.SetAllowHtmlText(Me.ToolStrip2, CType(resources.GetObject("ToolStrip2.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.ToolStrip2.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden
         Me.ToolStrip2.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripLabel2, Me.tbSelectEverything, Me.tbSelectNone})
+        resources.ApplyResources(Me.ToolStrip2, "ToolStrip2")
         Me.ToolStrip2.Name = "ToolStrip2"
-        Me.ToolTipController1.SetTitle(Me.ToolStrip2, resources.GetString("ToolStrip2.Title"))
-        Me.ToolTipController1.SetToolTip(Me.ToolStrip2, resources.GetString("ToolStrip2.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.ToolStrip2, CType(resources.GetObject("ToolStrip2.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         '
         'ToolStripLabel2
         '
@@ -264,51 +205,39 @@ Partial Class frmUserKonfig_AddUsers
         '
         'tbSelectEverything
         '
-        resources.ApplyResources(Me.tbSelectEverything, "tbSelectEverything")
         Me.tbSelectEverything.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text
         Me.tbSelectEverything.ForeColor = System.Drawing.Color.Firebrick
+        resources.ApplyResources(Me.tbSelectEverything, "tbSelectEverything")
         Me.tbSelectEverything.Name = "tbSelectEverything"
         '
         'tbSelectNone
         '
-        resources.ApplyResources(Me.tbSelectNone, "tbSelectNone")
         Me.tbSelectNone.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text
+        resources.ApplyResources(Me.tbSelectNone, "tbSelectNone")
         Me.tbSelectNone.Name = "tbSelectNone"
         '
         'btnCancel
         '
         resources.ApplyResources(Me.btnCancel, "btnCancel")
-        Me.ToolTipController1.SetAllowHtmlText(Me.btnCancel, CType(resources.GetObject("btnCancel.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.btnCancel.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel1
         Me.btnCancel.Name = "btnCancel"
-        Me.ToolTipController1.SetTitle(Me.btnCancel, resources.GetString("btnCancel.Title"))
-        Me.ToolTipController1.SetToolTip(Me.btnCancel, resources.GetString("btnCancel.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.btnCancel, CType(resources.GetObject("btnCancel.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         Me.btnCancel.UseVisualStyleBackColor = True
         '
         'btnAddUsers
         '
         resources.ApplyResources(Me.btnAddUsers, "btnAddUsers")
-        Me.ToolTipController1.SetAllowHtmlText(Me.btnAddUsers, CType(resources.GetObject("btnAddUsers.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.btnAddUsers.Image = Global.DD_Record_Organiser.My.Resources.Resources.add1
         Me.btnAddUsers.Name = "btnAddUsers"
-        Me.ToolTipController1.SetTitle(Me.btnAddUsers, resources.GetString("btnAddUsers.Title"))
-        Me.ToolTipController1.SetToolTip(Me.btnAddUsers, resources.GetString("btnAddUsers.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me.btnAddUsers, CType(resources.GetObject("btnAddUsers.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         Me.btnAddUsers.UseVisualStyleBackColor = True
         '
         'frmUserKonfig_AddUsers
         '
         resources.ApplyResources(Me, "$this")
-        Me.ToolTipController1.SetAllowHtmlText(Me, CType(resources.GetObject("$this.AllowHtmlText"), DevExpress.Utils.DefaultBoolean))
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.SplitContainer1)
         Me.MaximizeBox = False
         Me.MinimizeBox = False
         Me.Name = "frmUserKonfig_AddUsers"
-        Me.ToolTipController1.SetTitle(Me, resources.GetString("$this.Title"))
-        Me.ToolTipController1.SetToolTip(Me, resources.GetString("$this.ToolTip"))
-        Me.ToolTipController1.SetToolTipIconType(Me, CType(resources.GetObject("$this.ToolTipIconType"), DevExpress.Utils.ToolTipIconType))
         Me.SplitContainer1.Panel1.ResumeLayout(False)
         Me.SplitContainer1.Panel1.PerformLayout()
         Me.SplitContainer1.Panel2.ResumeLayout(False)