MS_20.10

2015-10-20 11:43:53 +02:00
parent a4341dd477
commit be7347af13
9 changed files with 324 additions and 167 deletions
--- a/app/DD-Record-Organiser/frmDokumentart_NameConvention.designer.vb
+++ b/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.cmbDate = New System.Windows.Forms.ComboBox()
-        Me.Label20 = New System.Windows.Forms.Label()
+        Me.GroupBox3 = New System.Windows.Forms.GroupBox()
+        Me.Label5 = 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:"
-        '
-        '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
+        Me.GroupBox1.Text = "Globale automatische Indexe:"
        '
        '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:"
-        '
-        '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:"
+        Me.Label3.Text = "Control-Werte aus Entität:"
        '
        '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.Button1.Location = New System.Drawing.Point(180, 91)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(30, 23)
-        Me.Button1.TabIndex = 13
-        Me.Button1.UseVisualStyleBackColor = True
+        Me.GroupBox3.Controls.Add(Me.Label5)
+        Me.GroupBox3.Controls.Add(Me.btnAddIndexA)
+        Me.GroupBox3.Controls.Add(Me.Label4)
+        Me.GroupBox3.Controls.Add(Me.cmbEntity)
+        Me.GroupBox3.Controls.Add(Me.cmbIndex_A)
+        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.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, 91)
-        Me.cmbDate.Name = "cmbDate"
-        Me.cmbDate.Size = New System.Drawing.Size(168, 23)
-        Me.cmbDate.TabIndex = 12
+        Me.Label5.AutoSize = True
+        Me.Label5.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Italic, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label5.Location = New System.Drawing.Point(6, 21)
+        Me.Label5.Name = "Label5"
+        Me.Label5.Size = New System.Drawing.Size(236, 26)
+        Me.Label5.TabIndex = 8
+        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.Label20.Location = New System.Drawing.Point(3, 69)
-        Me.Label20.Name = "Label20"
-        Me.Label20.Size = New System.Drawing.Size(99, 17)
-        Me.Label20.TabIndex = 11
-        Me.Label20.Text = "Datum-Struktur:"
+        Me.Label6.AutoSize = True
+        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.Label6.Location = New System.Drawing.Point(12, 73)
+        Me.Label6.Name = "Label6"
+        Me.Label6.Size = New System.Drawing.Size(177, 17)
+        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