MS_20.10

app/DD-Record-Organiser/DD-Record-Organiser.vbproj

@@ -1011,6 +1011,8 @@
     <None Include="Resources\arrow_Forward_16xLG.png" />
     <None Include="Resources\Close_16xLG.png" />
     <Content Include="DD_Icons_ICO_ADDI_1.ico" />
+    <None Include="Resources\cancel.png" />
+    <None Include="Resources\cancel1.png" />
     <Content Include="Resources\cube.ico" />
     <Content Include="Resources\138_PushPin_32x42_72.png" />
     <None Include="Resources\PropertyGridEditorPart_6041.png" />

app/DD-Record-Organiser/My Project/Resources.Designer.vb

@@ -360,6 +360,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property cancel() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("cancel", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
+        '''</summary>
+        Friend ReadOnly Property cancel1() As System.Drawing.Bitmap
+            Get
+                Dim obj As Object = ResourceManager.GetObject("cancel1", resourceCulture)
+                Return CType(obj,System.Drawing.Bitmap)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         '''</summary>

app/DD-Record-Organiser/My Project/Resources.resx

@@ -127,20 +127,20 @@
   <data name="note_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\note_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="flag_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="1532_Flag_Blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="application_form" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\application_form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Einstellungen3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Einstellungen3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="database_go1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_go1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DateOrTimePicker_675" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Men2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Men2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="PropertyGridEditorPart_6041" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\PropertyGridEditorPart_6041.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -160,17 +160,14 @@
   <data name="database_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="dtp1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="folder_Open_32xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_Open_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="user_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Property_501" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="application_form" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Property_501.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\application_form.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="save_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -181,6 +178,9 @@
   <data name="database_table" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="Monitor_Screen_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="table_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -193,12 +193,18 @@
   <data name="table" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="lbl" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lbl.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="database" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Label_684" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Label_684.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="user_suit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="table_add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\table_add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -214,6 +220,9 @@
   <data name="handdrawn_arrow_right_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\handdrawn_arrow_right_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="color_wheel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\color_wheel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -226,21 +235,21 @@
   <data name="Close_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Close_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="AddTable_5632" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="database_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="UserInterfaceEditor_5845" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\UserInterfaceEditor_5845.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="f2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="page_refresh" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\page_refresh.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ListBox_686_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ListBox_686_24.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="ico6078" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ico6078.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -253,21 +262,18 @@
   <data name="TextBox_708" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\TextBox_708.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="calendar" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\calendar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="add1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\add1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="save1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\save1.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="page_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="module_32xSM" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\module_32xSM.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="folder_Open_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_Open_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -283,8 +289,8 @@
   <data name="database_key" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_key.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database_gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="005_Task_32x42_72" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="138_PushPin_32x42_72" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\138_PushPin_32x42_721.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -295,9 +301,6 @@
   <data name="brainpool" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\brainpool.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="GroupBox_680" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\GroupBox_680.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Men6" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Men6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -328,14 +331,17 @@
   <data name="brick_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\brick_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="DD_Icons-ADDI" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="RadioButton_701" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\RadioButton_701.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="add" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="page_copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="PropertyGridEditorPart_6041" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\page_copy.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\PropertyGridEditorPart_6041.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="shield_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\shield_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -358,8 +364,8 @@
   <data name="Go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="1532_Flag_Blue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="DateOrTimePicker_675" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1532_Flag_Blue.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\DateOrTimePicker_675.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="database_connect" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\database_connect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -376,15 +382,15 @@
   <data name="ImageListControl_683" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\ImageListControl_683.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="database_error" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="userAccounts" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\userAccounts.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="folder_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\folder_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ComboBox_672" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="arrow_right" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\arrow_right.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
@@ -400,14 +406,11 @@
   <data name="module_32xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\module_32xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="AddTable_5632" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="calendar" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\AddTable_5632.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\calendar.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="grid_Data_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="database_gear" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\grid_Data_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\database_gear.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="lbl" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\lbl.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Home_5699_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Home_5699_32.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -436,35 +439,35 @@
   <data name="action_Cancel_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\action_Cancel_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Einstellungen3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="flag_green" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Einstellungen3.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\flag_green.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="CheckBox_669" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\CheckBox_669.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Monitor_Screen_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="grid_Data_16xMD" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Monitor_Screen_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\grid_Data_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Men2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Property_501" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Men2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Property_501.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="page_excel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\page_excel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="HomeHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\HomeHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Excel_25ixel" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Excel_25ixel.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="database_error" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="database_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_error.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\database_edit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Einstellungen6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="Table_748" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Table_748.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="f2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="GroupBox_680" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\f2.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\GroupBox_680.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="bricks" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\bricks.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -481,11 +484,11 @@
   <data name="user_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\user_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="dtp1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\dtp1.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="005_Task_32x42_72" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ComboBox_672" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\005_Task_32x42_72.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\ComboBox_672.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="AddressEnvelope_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\AddressEnvelope_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -493,8 +496,8 @@
   <data name="cmb" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\cmb.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="user_suit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="HomeHS" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_suit.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\HomeHS.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="FilteredObject_13400_16x" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\FilteredObject_13400_16x.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -508,13 +511,16 @@
   <data name="Checkbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Checkbox.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Einstellungen6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="ListBox_686_24" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Einstellungen6.ico;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\ListBox_686_24.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="action_Cancel_16xLG1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\action_Cancel_16xLG1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="DD_Icons-ADDI" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DD_Icons-ADDI.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\cancel.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cancel1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cancel1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

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

@@ -778,6 +778,7 @@ Partial Class frmDokumentart_Konfig
         'TableAdapterManager
         '
         Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Me.TBDD_DOKUMENTARTTableAdapter
         Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Me.TBDD_EINGANGSARTENTableAdapter
         Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Nothing
@@ -785,7 +786,6 @@ Partial Class frmDokumentart_Konfig
         Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Me.TBDD_INDEX_AUTOMTableAdapter
         Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing
@@ -797,6 +797,9 @@ Partial Class frmDokumentart_Konfig
         Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WORKFLOW_FORMTableAdapter = Nothing
@@ -873,7 +876,7 @@ Partial Class frmDokumentart_Konfig
         Me.XtraTabPage1.Controls.Add(Me.ListBox2)
         Me.XtraTabPage1.Controls.Add(Me.TBDD_INDEX_AUTOMBindingNavigator)
         Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(1265, 252)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(1261, 249)
         Me.XtraTabPage1.Text = "Automatische Indexe"
         '
         'Label2
@@ -998,7 +1001,7 @@ Partial Class frmDokumentart_Konfig
         Me.ListBox2.ItemHeight = 15
         Me.ListBox2.Location = New System.Drawing.Point(0, 25)
         Me.ListBox2.Name = "ListBox2"
-        Me.ListBox2.Size = New System.Drawing.Size(305, 227)
+        Me.ListBox2.Size = New System.Drawing.Size(305, 224)
         Me.ListBox2.TabIndex = 2
         Me.ListBox2.TabStop = False
         Me.ListBox2.ValueMember = "GUID"
@@ -1018,7 +1021,7 @@ Partial Class frmDokumentart_Konfig
         Me.TBDD_INDEX_AUTOMBindingNavigator.MovePreviousItem = Me.ToolStripButton4
         Me.TBDD_INDEX_AUTOMBindingNavigator.Name = "TBDD_INDEX_AUTOMBindingNavigator"
         Me.TBDD_INDEX_AUTOMBindingNavigator.PositionItem = Me.ToolStripTextBox1
-        Me.TBDD_INDEX_AUTOMBindingNavigator.Size = New System.Drawing.Size(1265, 25)
+        Me.TBDD_INDEX_AUTOMBindingNavigator.Size = New System.Drawing.Size(1261, 25)
         Me.TBDD_INDEX_AUTOMBindingNavigator.TabIndex = 1
         Me.TBDD_INDEX_AUTOMBindingNavigator.Text = "BindingNavigator1"
         '
@@ -1125,7 +1128,7 @@ Partial Class frmDokumentart_Konfig
         Me.XtraTabPage2.Controls.Add(Me.ComboBox1)
         Me.XtraTabPage2.Controls.Add(Me.BindingNavigator1)
         Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(1265, 252)
+        Me.XtraTabPage2.Size = New System.Drawing.Size(1261, 249)
         Me.XtraTabPage2.Text = "Zurodnung Dokumentart - Entität"
         '
         'Label3
@@ -1265,7 +1268,7 @@ Partial Class frmDokumentart_Konfig
         Me.BindingNavigator1.MovePreviousItem = Me.ToolStripButton11
         Me.BindingNavigator1.Name = "BindingNavigator1"
         Me.BindingNavigator1.PositionItem = Me.ToolStripTextBox2
-        Me.BindingNavigator1.Size = New System.Drawing.Size(1265, 25)
+        Me.BindingNavigator1.Size = New System.Drawing.Size(1261, 25)
         Me.BindingNavigator1.TabIndex = 2
         Me.BindingNavigator1.Text = "BindingNavigator1"
         '

app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb

@@ -26,16 +26,20 @@ Partial Class frmDokumentart_NameConvention
         Me.Label1 = New System.Windows.Forms.Label()
         Me.txtnamenKonv = New System.Windows.Forms.TextBox()
         Me.GroupBox1 = New System.Windows.Forms.GroupBox()
-        Me.btnAddIndexA = New System.Windows.Forms.Button()
         Me.btnAddIndexM = New System.Windows.Forms.Button()
+        Me.cmbIndex_m = New System.Windows.Forms.ComboBox()
+        Me.Label4 = New System.Windows.Forms.Label()
+        Me.cmbEntity = New System.Windows.Forms.ComboBox()
+        Me.btnAddIndexA = New System.Windows.Forms.Button()
         Me.cmbIndex_A = New System.Windows.Forms.ComboBox()
         Me.TBDD_INDEX_AUTOMBindingSource = New System.Windows.Forms.BindingSource(Me.components)
         Me.DD_DMSDataSet = New DD_Record_Organiser.DD_DMSDataSet()
-        Me.cmbIndex_m = New System.Windows.Forms.ComboBox()
         Me.Label3 = New System.Windows.Forms.Label()
-        Me.Label2 = New System.Windows.Forms.Label()
         Me.GroupBox2 = New System.Windows.Forms.GroupBox()
+        Me.Button1 = New System.Windows.Forms.Button()
         Me.btnTrennzeichen = New System.Windows.Forms.Button()
+        Me.cmbDate = New System.Windows.Forms.ComboBox()
+        Me.Label20 = New System.Windows.Forms.Label()
         Me.btndelete = New System.Windows.Forms.Button()
         Me.btnOK = New System.Windows.Forms.Button()
         Me.btnclose = New System.Windows.Forms.Button()
@@ -45,22 +49,24 @@ Partial Class frmDokumentart_NameConvention
         Me.TBDD_INDEX_AUTOMTableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.TBDD_INDEX_AUTOMTableAdapter()
         Me.VERSION_DELIMITERTextBox = New System.Windows.Forms.TextBox()
         Me.FILE_DELIMITERTextBox = New System.Windows.Forms.TextBox()
-        Me.Button1 = New System.Windows.Forms.Button()
+        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
-        Me.cmbDate = New System.Windows.Forms.ComboBox()
+        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Label20 = New System.Windows.Forms.Label()
+        Me.Label6 = New System.Windows.Forms.Label()
         Me.GroupBox1.SuspendLayout()
         CType(Me.TBDD_INDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.GroupBox2.SuspendLayout()
         CType(Me.TBPMO_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.GroupBox3.SuspendLayout()
         Me.SuspendLayout()
         '
         'Label1
         '
         Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.Label1.Location = New System.Drawing.Point(9, 20)
         Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(438, 51)
+        Me.Label1.Size = New System.Drawing.Size(400, 45)
         Me.Label1.TabIndex = 0
         Me.Label1.Text = "Definieren Sie hier die Namenskonvention zur ausgewählten Dokumentart." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Sie haben" & _
     " die Möglichkeit den Dateinamen aus den unten aufgeführten" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Indizes und Textbaus" & _
@@ -68,52 +74,83 @@ Partial Class frmDokumentart_NameConvention
         '
         'txtnamenKonv
         '
-        Me.txtnamenKonv.Location = New System.Drawing.Point(12, 74)
+        Me.txtnamenKonv.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.txtnamenKonv.Location = New System.Drawing.Point(12, 93)
         Me.txtnamenKonv.Name = "txtnamenKonv"
-        Me.txtnamenKonv.Size = New System.Drawing.Size(401, 25)
+        Me.txtnamenKonv.Size = New System.Drawing.Size(417, 23)
         Me.txtnamenKonv.TabIndex = 1
         '
         'GroupBox1
         '
-        Me.GroupBox1.Controls.Add(Me.btnAddIndexA)
         Me.GroupBox1.Controls.Add(Me.btnAddIndexM)
-        Me.GroupBox1.Controls.Add(Me.cmbIndex_A)
         Me.GroupBox1.Controls.Add(Me.cmbIndex_m)
-        Me.GroupBox1.Controls.Add(Me.Label3)
-        Me.GroupBox1.Controls.Add(Me.Label2)
         Me.GroupBox1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox1.Location = New System.Drawing.Point(12, 114)
+        Me.GroupBox1.Location = New System.Drawing.Point(12, 124)
         Me.GroupBox1.Name = "GroupBox1"
-        Me.GroupBox1.Size = New System.Drawing.Size(237, 124)
+        Me.GroupBox1.Size = New System.Drawing.Size(237, 56)
         Me.GroupBox1.TabIndex = 2
         Me.GroupBox1.TabStop = False
-        Me.GroupBox1.Text = "Indexe zur Auswahl:"
+        Me.GroupBox1.Text = "Globale automatische Indexe:"
-        '
-        'btnAddIndexA
-        '
-        Me.btnAddIndexA.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD
-        Me.btnAddIndexA.Location = New System.Drawing.Point(197, 89)
-        Me.btnAddIndexA.Name = "btnAddIndexA"
-        Me.btnAddIndexA.Size = New System.Drawing.Size(30, 23)
-        Me.btnAddIndexA.TabIndex = 5
-        Me.btnAddIndexA.UseVisualStyleBackColor = True
         '
         'btnAddIndexM
         '
         Me.btnAddIndexM.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD
-        Me.btnAddIndexM.Location = New System.Drawing.Point(197, 41)
+        Me.btnAddIndexM.Location = New System.Drawing.Point(197, 24)
         Me.btnAddIndexM.Name = "btnAddIndexM"
         Me.btnAddIndexM.Size = New System.Drawing.Size(30, 23)
         Me.btnAddIndexM.TabIndex = 4
         Me.btnAddIndexM.UseVisualStyleBackColor = True
         '
+        'cmbIndex_m
+        '
+        Me.cmbIndex_m.DisplayMember = "DOKUMENTART_ID"
+        Me.cmbIndex_m.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cmbIndex_m.FormattingEnabled = True
+        Me.cmbIndex_m.Location = New System.Drawing.Point(9, 24)
+        Me.cmbIndex_m.Name = "cmbIndex_m"
+        Me.cmbIndex_m.Size = New System.Drawing.Size(182, 25)
+        Me.cmbIndex_m.TabIndex = 2
+        Me.cmbIndex_m.ValueMember = "DOKUMENTART_ID"
+        '
+        'Label4
+        '
+        Me.Label4.AutoSize = True
+        Me.Label4.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label4.Location = New System.Drawing.Point(6, 58)
+        Me.Label4.Name = "Label4"
+        Me.Label4.Size = New System.Drawing.Size(87, 15)
+        Me.Label4.TabIndex = 7
+        Me.Label4.Text = "Entität wählen:"
+        '
+        'cmbEntity
+        '
+        Me.cmbEntity.DisplayMember = "GUID"
+        Me.cmbEntity.Font = New System.Drawing.Font("Segoe UI Semibold", 9.0!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cmbEntity.FormattingEnabled = True
+        Me.cmbEntity.Location = New System.Drawing.Point(9, 74)
+        Me.cmbEntity.Name = "cmbEntity"
+        Me.cmbEntity.Size = New System.Drawing.Size(218, 23)
+        Me.cmbEntity.TabIndex = 6
+        Me.cmbEntity.ValueMember = "GUID"
+        '
+        'btnAddIndexA
+        '
+        Me.btnAddIndexA.Enabled = False
+        Me.btnAddIndexA.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD
+        Me.btnAddIndexA.Location = New System.Drawing.Point(197, 120)
+        Me.btnAddIndexA.Name = "btnAddIndexA"
+        Me.btnAddIndexA.Size = New System.Drawing.Size(30, 23)
+        Me.btnAddIndexA.TabIndex = 5
+        Me.btnAddIndexA.UseVisualStyleBackColor = True
+        '
         'cmbIndex_A
         '
         Me.cmbIndex_A.DataSource = Me.TBDD_INDEX_AUTOMBindingSource
         Me.cmbIndex_A.DisplayMember = "INDEXNAME"
+        Me.cmbIndex_A.Enabled = False
         Me.cmbIndex_A.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.cmbIndex_A.FormattingEnabled = True
-        Me.cmbIndex_A.Location = New System.Drawing.Point(9, 89)
+        Me.cmbIndex_A.Location = New System.Drawing.Point(9, 120)
         Me.cmbIndex_A.Name = "cmbIndex_A"
         Me.cmbIndex_A.Size = New System.Drawing.Size(182, 25)
         Me.cmbIndex_A.TabIndex = 3
@@ -129,36 +166,15 @@ Partial Class frmDokumentart_NameConvention
         Me.DD_DMSDataSet.DataSetName = "DD_DMSDataSet"
         Me.DD_DMSDataSet.SchemaSerializationMode = System.Data.SchemaSerializationMode.IncludeSchema
         '
-        'cmbIndex_m
-        '
-        Me.cmbIndex_m.DisplayMember = "DOKUMENTART_ID"
-        Me.cmbIndex_m.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbIndex_m.FormattingEnabled = True
-        Me.cmbIndex_m.Location = New System.Drawing.Point(9, 41)
-        Me.cmbIndex_m.Name = "cmbIndex_m"
-        Me.cmbIndex_m.Size = New System.Drawing.Size(182, 25)
-        Me.cmbIndex_m.TabIndex = 2
-        Me.cmbIndex_m.ValueMember = "DOKUMENTART_ID"
-        '
         'Label3
         '
         Me.Label3.AutoSize = True
         Me.Label3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label3.Location = New System.Drawing.Point(6, 69)
+        Me.Label3.Location = New System.Drawing.Point(6, 100)
         Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(129, 17)
+        Me.Label3.Size = New System.Drawing.Size(158, 17)
         Me.Label3.TabIndex = 1
-        Me.Label3.Text = "Automatischer Index:"
+        Me.Label3.Text = "Control-Werte aus Entität:"
-        '
-        'Label2
-        '
-        Me.Label2.AutoSize = True
-        Me.Label2.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label2.Location = New System.Drawing.Point(6, 21)
-        Me.Label2.Name = "Label2"
-        Me.Label2.Size = New System.Drawing.Size(104, 17)
-        Me.Label2.TabIndex = 0
-        Me.Label2.Text = "Manueller Index:"
         '
         'GroupBox2
         '
@@ -166,18 +182,27 @@ Partial Class frmDokumentart_NameConvention
         Me.GroupBox2.Controls.Add(Me.btnTrennzeichen)
         Me.GroupBox2.Controls.Add(Me.cmbDate)
         Me.GroupBox2.Controls.Add(Me.Label20)
-        Me.GroupBox2.Location = New System.Drawing.Point(255, 114)
+        Me.GroupBox2.Location = New System.Drawing.Point(255, 124)
         Me.GroupBox2.Name = "GroupBox2"
-        Me.GroupBox2.Size = New System.Drawing.Size(216, 124)
+        Me.GroupBox2.Size = New System.Drawing.Size(216, 104)
         Me.GroupBox2.TabIndex = 3
         Me.GroupBox2.TabStop = False
         Me.GroupBox2.Text = "Variablen einfügen:"
         '
+        'Button1
+        '
+        Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD
+        Me.Button1.Location = New System.Drawing.Point(180, 72)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(30, 23)
+        Me.Button1.TabIndex = 13
+        Me.Button1.UseVisualStyleBackColor = True
+        '
         'btnTrennzeichen
         '
         Me.btnTrennzeichen.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD
         Me.btnTrennzeichen.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnTrennzeichen.Location = New System.Drawing.Point(6, 40)
+        Me.btnTrennzeichen.Location = New System.Drawing.Point(6, 24)
         Me.btnTrennzeichen.Name = "btnTrennzeichen"
         Me.btnTrennzeichen.Size = New System.Drawing.Size(168, 25)
         Me.btnTrennzeichen.TabIndex = 6
@@ -185,10 +210,29 @@ Partial Class frmDokumentart_NameConvention
         Me.btnTrennzeichen.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnTrennzeichen.UseVisualStyleBackColor = True
         '
+        'cmbDate
+        '
+        Me.cmbDate.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.cmbDate.FormattingEnabled = True
+        Me.cmbDate.Items.AddRange(New Object() {"YY_MM_DD", "YYYY_MM_DD", "DD_MM_YY", "DD_MM_YYYY"})
+        Me.cmbDate.Location = New System.Drawing.Point(6, 72)
+        Me.cmbDate.Name = "cmbDate"
+        Me.cmbDate.Size = New System.Drawing.Size(168, 23)
+        Me.cmbDate.TabIndex = 12
+        '
+        'Label20
+        '
+        Me.Label20.AutoSize = True
+        Me.Label20.Location = New System.Drawing.Point(3, 52)
+        Me.Label20.Name = "Label20"
+        Me.Label20.Size = New System.Drawing.Size(99, 17)
+        Me.Label20.TabIndex = 11
+        Me.Label20.Text = "Datum-Struktur:"
+        '
         'btndelete
         '
         Me.btndelete.Image = Global.DD_Record_Organiser.My.Resources.Resources.delete
-        Me.btndelete.Location = New System.Drawing.Point(419, 74)
+        Me.btndelete.Location = New System.Drawing.Point(435, 93)
         Me.btndelete.Name = "btndelete"
         Me.btndelete.Size = New System.Drawing.Size(28, 25)
         Me.btndelete.TabIndex = 4
@@ -198,9 +242,9 @@ Partial Class frmDokumentart_NameConvention
         '
         Me.btnOK.Image = Global.DD_Record_Organiser.My.Resources.Resources.save_16xLG
         Me.btnOK.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnOK.Location = New System.Drawing.Point(261, 244)
+        Me.btnOK.Location = New System.Drawing.Point(258, 306)
         Me.btnOK.Name = "btnOK"
-        Me.btnOK.Size = New System.Drawing.Size(94, 26)
+        Me.btnOK.Size = New System.Drawing.Size(110, 26)
         Me.btnOK.TabIndex = 5
         Me.btnOK.Text = "Speichern"
         Me.btnOK.TextAlign = System.Drawing.ContentAlignment.MiddleRight
@@ -208,11 +252,14 @@ Partial Class frmDokumentart_NameConvention
         '
         'btnclose
         '
-        Me.btnclose.Location = New System.Drawing.Point(361, 244)
+        Me.btnclose.Image = Global.DD_Record_Organiser.My.Resources.Resources.cancel1
+        Me.btnclose.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.btnclose.Location = New System.Drawing.Point(374, 306)
         Me.btnclose.Name = "btnclose"
-        Me.btnclose.Size = New System.Drawing.Size(110, 26)
+        Me.btnclose.Size = New System.Drawing.Size(94, 26)
         Me.btnclose.TabIndex = 6
         Me.btnclose.Text = "Abbruch"
+        Me.btnclose.TextAlign = System.Drawing.ContentAlignment.MiddleRight
         Me.btnclose.UseVisualStyleBackColor = True
         '
         'TBPMO_KONFIGURATIONBindingSource
@@ -227,6 +274,7 @@ Partial Class frmDokumentart_NameConvention
         'TableAdapterManager
         '
         Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_DOKUMENTARTTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_EINGANGSARTENTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_EMAIL_ACCOUNTTableAdapter = Nothing
@@ -234,7 +282,6 @@ Partial Class frmDokumentart_NameConvention
         Me.TableAdapterManager.TBDD_INDEX_AUTOMTableAdapter = Me.TBDD_INDEX_AUTOMTableAdapter
         Me.TableAdapterManager.TBDD_USER_GROUPSTableAdapter = Nothing
         Me.TableAdapterManager.TBDD_USERTableAdapter = Nothing
-        Me.TableAdapterManager.TBDD_CONNECTIONTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_FILES_USERTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_FOLLOW_UP_EMAILTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_FOLLUPEMAIL_USERTableAdapter = Nothing
@@ -246,6 +293,9 @@ Partial Class frmDokumentart_NameConvention
         Me.TableAdapterManager.TBPMO_KONFIGURATIONTableAdapter = Me.TBPMO_KONFIGURATIONTableAdapter
         Me.TableAdapterManager.TBPMO_RECORD_LOG_CONFIGTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_RECORDTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITY_PATTERNTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_TEMPLATE_ENTITYTableAdapter = Nothing
+        Me.TableAdapterManager.TBPMO_TEMPLATETableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_FVIEW_DT_INDEXTableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WD_OBJECTTYPETableAdapter = Nothing
         Me.TableAdapterManager.TBPMO_WORKFLOW_FORMTableAdapter = Nothing
@@ -279,40 +329,51 @@ Partial Class frmDokumentart_NameConvention
         Me.FILE_DELIMITERTextBox.Size = New System.Drawing.Size(36, 18)
         Me.FILE_DELIMITERTextBox.TabIndex = 10
         '
-        'Button1
+        'GroupBox3
         '
-        Me.Button1.Image = Global.DD_Record_Organiser.My.Resources.Resources.action_add_16xMD
+        Me.GroupBox3.Controls.Add(Me.Label5)
-        Me.Button1.Location = New System.Drawing.Point(180, 91)
+        Me.GroupBox3.Controls.Add(Me.btnAddIndexA)
-        Me.Button1.Name = "Button1"
+        Me.GroupBox3.Controls.Add(Me.Label4)
-        Me.Button1.Size = New System.Drawing.Size(30, 23)
+        Me.GroupBox3.Controls.Add(Me.cmbEntity)
-        Me.Button1.TabIndex = 13
+        Me.GroupBox3.Controls.Add(Me.cmbIndex_A)
-        Me.Button1.UseVisualStyleBackColor = True
+        Me.GroupBox3.Controls.Add(Me.Label3)
+        Me.GroupBox3.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.GroupBox3.Location = New System.Drawing.Point(15, 186)
+        Me.GroupBox3.Name = "GroupBox3"
+        Me.GroupBox3.Size = New System.Drawing.Size(237, 153)
+        Me.GroupBox3.TabIndex = 11
+        Me.GroupBox3.TabStop = False
+        Me.GroupBox3.Text = "Entitäts-abhängige Indexe:"
         '
-        'cmbDate
+        'Label5
         '
-        Me.cmbDate.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label5.AutoSize = True
-        Me.cmbDate.FormattingEnabled = True
+        Me.Label5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.cmbDate.Items.AddRange(New Object() {"YY_MM_DD", "YYYY_MM_DD", "DD_MM_YY", "DD_MM_YYYY"})
+        Me.Label5.Location = New System.Drawing.Point(6, 21)
-        Me.cmbDate.Location = New System.Drawing.Point(6, 91)
+        Me.Label5.Name = "Label5"
-        Me.cmbDate.Name = "cmbDate"
+        Me.Label5.Size = New System.Drawing.Size(236, 26)
-        Me.cmbDate.Size = New System.Drawing.Size(168, 23)
+        Me.Label5.TabIndex = 8
-        Me.cmbDate.TabIndex = 12
+        Me.Label5.Text = "Zur Dateibenennung können Sie auch Werte aus " & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "dem zur Laufzeit aktuellen Datensa" & _
+    "tzes nutzen."
         '
-        'Label20
+        'Label6
         '
-        Me.Label20.AutoSize = True
+        Me.Label6.AutoSize = True
-        Me.Label20.Location = New System.Drawing.Point(3, 69)
+        Me.Label6.Font = New System.Drawing.Font("Segoe UI Semibold", 9.75!, CType((System.Drawing.FontStyle.Bold Or System.Drawing.FontStyle.Italic), System.Drawing.FontStyle), System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.Label20.Name = "Label20"
+        Me.Label6.Location = New System.Drawing.Point(12, 73)
-        Me.Label20.Size = New System.Drawing.Size(99, 17)
+        Me.Label6.Name = "Label6"
-        Me.Label20.TabIndex = 11
+        Me.Label6.Size = New System.Drawing.Size(177, 17)
-        Me.Label20.Text = "Datum-Struktur:"
+        Me.Label6.TabIndex = 12
+        Me.Label6.Text = "Aktuelle Namenkonvention:"
         '
         'frmDokumentart_NameConvention
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(478, 278)
+        Me.ClientSize = New System.Drawing.Size(478, 349)
         Me.ControlBox = False
+        Me.Controls.Add(Me.Label6)
+        Me.Controls.Add(Me.GroupBox3)
         Me.Controls.Add(Me.FILE_DELIMITERTextBox)
         Me.Controls.Add(Me.VERSION_DELIMITERTextBox)
         Me.Controls.Add(Me.btnclose)
@@ -327,14 +388,15 @@ Partial Class frmDokumentart_NameConvention
         Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
         Me.Name = "frmDokumentart_NameConvention"
         Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
-        Me.Text = "Assistent zur Namenskonvention:"
+        Me.Text = "Assistent zur Namenskonvention/Dateibenennung:"
         Me.GroupBox1.ResumeLayout(False)
-        Me.GroupBox1.PerformLayout()
         CType(Me.TBDD_INDEX_AUTOMBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.DD_DMSDataSet, System.ComponentModel.ISupportInitialize).EndInit()
         Me.GroupBox2.ResumeLayout(False)
         Me.GroupBox2.PerformLayout()
         CType(Me.TBPMO_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.GroupBox3.ResumeLayout(False)
+        Me.GroupBox3.PerformLayout()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -349,7 +411,6 @@ Partial Class frmDokumentart_NameConvention
     Friend WithEvents cmbIndex_A As System.Windows.Forms.ComboBox
     Friend WithEvents cmbIndex_m As System.Windows.Forms.ComboBox
     Friend WithEvents Label3 As System.Windows.Forms.Label
-    Friend WithEvents Label2 As System.Windows.Forms.Label
     Friend WithEvents btnAddIndexA As System.Windows.Forms.Button
     Friend WithEvents GroupBox2 As System.Windows.Forms.GroupBox
     Friend WithEvents btndelete As System.Windows.Forms.Button
@@ -368,4 +429,9 @@ Partial Class frmDokumentart_NameConvention
     Friend WithEvents Button1 As System.Windows.Forms.Button
     Friend WithEvents cmbDate As System.Windows.Forms.ComboBox
     Friend WithEvents Label20 As System.Windows.Forms.Label
+    Friend WithEvents Label4 As System.Windows.Forms.Label
+    Friend WithEvents cmbEntity As System.Windows.Forms.ComboBox
+    Friend WithEvents GroupBox3 As System.Windows.Forms.GroupBox
+    Friend WithEvents Label5 As System.Windows.Forms.Label
+    Friend WithEvents Label6 As System.Windows.Forms.Label
 End Class

app/DD-Record-Organiser/frmDokumentart_NameConvention.resx

@@ -120,6 +120,12 @@
   <metadata name="TBDD_INDEX_AUTOMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>871, 17</value>
   </metadata>
+  <metadata name="TBDD_INDEX_AUTOMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>871, 17</value>
+  </metadata>
+  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
   <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

app/DD-Record-Organiser/frmDokumentart_NameConvention.vb

@@ -1,4 +1,9 @@
 Public Class frmDokumentart_NameConvention
+    Private DT_ENTITIES As DataTable
+    Private FORM_ID As Integer
+    Private FORM_VIEW_ID As Integer
+    Private TBPMO_WD_FORMVIEW_DOKTYPES_GUID As Integer
+    Private loaded As Boolean = False
 
     Private Sub Button1_Click(sender As Object, e As EventArgs) Handles btnAddIndexM.Click
         If Not Me.cmbIndex_m.Text = "" Then
@@ -13,7 +18,7 @@
     Private Sub btnAddIndexA_Click(sender As Object, e As EventArgs) Handles btnAddIndexA.Click
         If Not Me.cmbIndex_A.Text = "" Then
             'AREANLAGE-[%mARENR]-[%aKurzname]-I[%Version]
-            Dim text As String = "[%a" & Me.cmbIndex_A.Text.ToString.ToUpper & "]"
+            Dim text As String = "[%a" & Me.cmbIndex_A.Text.ToString.ToUpper & "|" & cmbIndex_A.SelectedValue & "]"
             Dim altePosition As Integer = Me.txtnamenKonv.SelectionStart()
             Me.txtnamenKonv.Text = Me.txtnamenKonv.Text.Insert(altePosition, text)
             Me.txtnamenKonv.SelectionStart = altePosition + text.Length
@@ -33,10 +38,12 @@
             Me.TBPMO_KONFIGURATIONTableAdapter.Connection.ConnectionString = MyConnectionString
             Me.TBPMO_KONFIGURATIONTableAdapter.Fill(Me.DD_DMSDataSet.TBPMO_KONFIGURATION)
             Me.TBDD_INDEX_AUTOMTableAdapter.Fill(Me.DD_DMSDataSet.TBDD_INDEX_AUTOM, frmDokumentart_Konfig.akt_DokartID)
-            'Me.TBINDEX_MANTableAdapter.Fill(Me.DSDokumentart.TBINDEX_MAN, frmAdministration._aktDokID)
+            DT_ENTITIES = ClassDatabase.Return_Datatable("select T.GUID, T.FORMVIEW_ID, T1.FORM_TITLE FROM TBPMO_WD_FORMVIEW_DOKTYPES T, TBPMO_FORM_VIEW T1 WHERE T.FORMVIEW_ID = T1.GUID AND T1.SCREEN_ID = 1 AND T.DOCTYPE_ID = " & frmDokumentart_Konfig.akt_DokartID & " ORDER BY T1.FORM_TITLE", "Load NameConventionData")
-            'Me.TBINDEX_AUTOMTableAdapter.Fill(Me.DSDokumentart.TBINDEX_AUTOM, frmAdministration._aktDokID)
+            cmbEntity.DataSource = DT_ENTITIES
-
+            cmbEntity.DisplayMember = DT_ENTITIES.Columns(2).ColumnName
-            txtnamenKonv.Text = frmDokumentart_Konfig.akt_Namenkonvention
+            cmbEntity.ValueMember = DT_ENTITIES.Columns(0).ColumnName
+            cmbEntity.SelectedIndex = 0
+            'txtnamenKonv.Text = frmDokumentart_Konfig.akt_Namenkonvention
         Catch ex As Exception
             MsgBox("Fehler beim Laden der Grunddaten zur Dokumentart: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
         End Try
@@ -50,8 +57,11 @@
     End Sub
 
     Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
-        frmDokumentart_Konfig.akt_Namenkonvention = txtnamenKonv.Text
+        Dim sql = "UPDATE TBPMO_WD_FORMVIEW_DOKTYPES SET NAME_CONVENTION = '" & txtnamenKonv.Text & "', CHANGED_WHO = '" & Environment.UserName & "' WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID
-        Me.Close()
+        If ClassDatabase.Execute_non_Query(sql, True) = True Then
+            frmDokumentart_Konfig.akt_Namenkonvention = txtnamenKonv.Text
+            Me.Close()
+        End If
     End Sub
 
     Private Sub btnclose_Click(sender As Object, e As EventArgs) Handles btnclose.Click
@@ -73,4 +83,48 @@
             Me.txtnamenKonv.SelectionStart = altePosition + text.Length
         End If
     End Sub
+
+    Private Sub cmbEntity_SelectedIndexChanged(sender As Object, e As EventArgs) Handles cmbEntity.SelectedIndexChanged
+        Try
+            If cmbEntity.SelectedIndex <> -1 Then
+                TBPMO_WD_FORMVIEW_DOKTYPES_GUID = Me.cmbEntity.SelectedValue
+                FORM_VIEW_ID = ClassDatabase.Execute_Scalar("SELECT FORMVIEW_ID FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID, True)
+                Dim NameConv = ClassDatabase.Execute_Scalar("SELECT NAME_CONVENTION FROM TBPMO_WD_FORMVIEW_DOKTYPES WHERE GUID = " & TBPMO_WD_FORMVIEW_DOKTYPES_GUID, True)
+                If Not IsNothing(NameConv) Then
+                    Me.txtnamenKonv.Text = NameConv
+                    Load_Controls()
+                End If
+            End If
+        Catch ex As Exception
+            MsgBox("Error in cmbEntity.SelectedIndexChanged: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+    Sub Load_Controls()
+        If loaded = False Then Exit Sub
+        Try
+            Dim DT1 As DataTable = ClassDatabase.Return_Datatable("SELECT [CONTROL_ID] , [CONTROL_COL_NAME]  AS DISPLAY FROM [VWPMO_CONTROL_SCREEN] WHERE CTRLTYPE_ID in (2,3,4) and FORM_ID = (SELECT FORM_ID FROM TBPMO_FORM_VIEW WHERE GUID = " & FORM_VIEW_ID & ")", "LoadControlsForEntity - NameConvention")
+            If DT1.Rows.Count >= 1 Then
+                cmbIndex_A.DataSource = DT1
+                cmbIndex_A.DisplayMember = DT1.Columns(1).ColumnName
+                cmbIndex_A.ValueMember = DT1.Columns(0).ColumnName
+                cmbIndex_A.DroppedDown = True
+                cmbIndex_A.Enabled = True
+                btnAddIndexA.Enabled = True
+            Else
+                cmbIndex_A.Enabled = False
+                btnAddIndexA.Enabled = False
+                cmbIndex_A.DroppedDown = False
+            End If
+
+        Catch ex As Exception
+            MsgBox("Error in Load Controls for EntitySelect: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Sub frmDokumentart_NameConvention_Shown(sender As Object, e As EventArgs) Handles Me.Shown
+        loaded = True
+        If DT_ENTITIES.Rows.Count = 1 Then
+            Load_Controls()
+        End If
+    End Sub
 End Class