ZooFlow: Add Base Form

ZooFlow: Finishing Attribute Form
2021-02-12 12:50:04 +01:00 · 2021-02-12 11:28:25 +01:00
17 changed files with 417 additions and 164 deletions
--- a/GUIs.ZooFlow/Administration/frmAdmin_Base.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Base.vb
@@ -0,0 +1,34 @@
+Imports DevExpress.XtraBars.Ribbon
+Imports DigitalData.Modules.Logging
+
+Partial Public MustInherit Class BaseForm
+    Inherits RibbonForm
+
+    Private Logger As Logger
+
+    Public Sub New()
+        Logger = My.LogConfig.GetLogger
+    End Sub
+
+    Public Sub ShowInfo(Message As String)
+        MessageBox.Show(Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Information)
+    End Sub
+
+    Public Sub ShowError(Message As String)
+        MessageBox.Show(Message, Text, MessageBoxButtons.OK, MessageBoxIcon.Exclamation)
+    End Sub
+
+    Public Sub ShowError(Exception As Exception)
+        Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True)
+        Logger.Error(Exception)
+        ShowError($"Error in {oCallingClass}:{vbNewLine}{Exception.Message}")
+    End Sub
+End Class
+
+Public Class BaseFormImpl
+    Inherits BaseForm
+End Class
+
+Partial Public Class frmAdmin_Base
+    Inherits BaseFormImpl
+End Class
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb
@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class frmAdmin_Attribute
-    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
+Partial Class frmAdmin_IDBAttribute
+    Inherits frmAdmin_Base

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()>
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx
+++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.resx
--- a/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb
@@ -1,12 +1,13 @@
 Imports DigitalData.Modules.Logging

-Public Class frmAdmin_Attribute
-    Implements interfaceAdmin_Form
+Public Class frmAdmin_IDBAttribute
+    Inherits frmAdmin_Base
+    Implements frmAdmin_Interface

-    Private Property PrimaryKey As Integer Implements interfaceAdmin_Form.PrimaryKey
-    Private Property Logger As Logger Implements interfaceAdmin_Form.Logger
-    Public Property HasChanges As Boolean = False Implements interfaceAdmin_Form.HasChanges
-    Public Property IsInsert As Boolean = False Implements interfaceAdmin_Form.IsInsert
+    Private Property Logger As Logger Implements frmAdmin_Interface.Logger
+    Public Property HasChanges As Boolean = False Implements frmAdmin_Interface.HasChanges
+    Public Property IsInsert As Boolean = False Implements frmAdmin_Interface.IsInsert
+    Public Property PrimaryKey As Integer Implements frmAdmin_Interface.PrimaryKey

    Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False)
        ' Dieser Aufruf ist für den Designer erforderlich.
@@ -22,7 +23,7 @@ Public Class frmAdmin_Attribute
        Try
            TBIDB_ATTRIBUTETableAdapter.Fill(DSIDB_Stammdaten.TBIDB_ATTRIBUTE, PrimaryKey)
        Catch ex As Exception
-            Logger.Error(ex)
+            ShowError(ex)
        End Try
    End Sub

@@ -51,7 +52,7 @@ Public Class frmAdmin_Attribute
        End If
    End Sub

-    Public Function SaveData() As Boolean Implements interfaceAdmin_Form.SaveData
+    Public Function SaveData() As Boolean Implements frmAdmin_Interface.SaveData
        Try
            TBIDB_ATTRIBUTEBindingSource.EndEdit()

@@ -59,9 +60,9 @@ Public Class frmAdmin_Attribute
                HasChanges = True

                If IsInsert Then
-                    txtAddedWho.Text = My.Application.User.UserName
+                    txtAddedWho.EditValue = My.Application.User.UserName
                Else
-                    txtChangedWho.Text = My.Application.User.UserName
+                    txtChangedWho.EditValue = My.Application.User.UserName
                End If

                TBIDB_ATTRIBUTEBindingSource.EndEdit()
@@ -70,7 +71,7 @@ Public Class frmAdmin_Attribute

            Return True
        Catch ex As Exception
-            Logger.Error(ex)
+            ShowError(ex)
            Return False
        End Try
    End Function
--- a/GUIs.ZooFlow/Administration/interfaceAdmin_Form.vb
+++ b/GUIs.ZooFlow/Administration/interfaceAdmin_Form.vb
@@ -1,6 +1,6 @@
 Imports DigitalData.Modules.Logging

-Public Interface interfaceAdmin_Form
+Public Interface frmAdmin_Interface
    Property PrimaryKey As Integer
    Property Logger As Logger
    Property HasChanges As Boolean
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmAdmin_Start
-    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
+    Inherits frmAdmin_Base

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()>
@@ -40,11 +40,12 @@ Partial Class frmAdmin_Start
        Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
        Me.labelStatus = New DevExpress.XtraBars.BarStaticItem()
        Me.labelError = New DevExpress.XtraBars.BarStaticItem()
-        Me.BarButtonItemSaveAttribute = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItemAddAttribute = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItemRefreshAttribute = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPage_ClipboardWatcher = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonGroup_ClipboardWatcher_Profile = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonGroup_ClipboardWatcher_DocSearch = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -123,8 +124,6 @@ Partial Class frmAdmin_Start
        Me.XtraTabPageIDB_Attributes.SuspendLayout()
        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.XtraTabPage_GlobalIndexer.SuspendLayout()
-        Me.XtraTabPage_ClipboardWatcher.SuspendLayout()
        CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.XtraTabControl.SuspendLayout()
        Me.SuspendLayout()
@@ -134,7 +133,7 @@ Partial Class frmAdmin_Start
        CHANGED_WHENLabel.AutoSize = True
        CHANGED_WHENLabel.Location = New System.Drawing.Point(472, 188)
        CHANGED_WHENLabel.Name = "CHANGED_WHENLabel"
-        CHANGED_WHENLabel.Size = New System.Drawing.Size(85, 13)
+        CHANGED_WHENLabel.Size = New System.Drawing.Size(90, 13)
        CHANGED_WHENLabel.TabIndex = 20
        CHANGED_WHENLabel.Text = "Geändert wann:"
        '
@@ -143,7 +142,7 @@ Partial Class frmAdmin_Start
        CHANGED_WHOLabel.AutoSize = True
        CHANGED_WHOLabel.Location = New System.Drawing.Point(351, 188)
        CHANGED_WHOLabel.Name = "CHANGED_WHOLabel"
-        CHANGED_WHOLabel.Size = New System.Drawing.Size(77, 13)
+        CHANGED_WHOLabel.Size = New System.Drawing.Size(80, 13)
        CHANGED_WHOLabel.TabIndex = 18
        CHANGED_WHOLabel.Text = "Geändert wer:"
        '
@@ -152,7 +151,7 @@ Partial Class frmAdmin_Start
        ADDED_WHENLabel.AutoSize = True
        ADDED_WHENLabel.Location = New System.Drawing.Point(472, 146)
        ADDED_WHENLabel.Name = "ADDED_WHENLabel"
-        ADDED_WHENLabel.Size = New System.Drawing.Size(73, 13)
+        ADDED_WHENLabel.Size = New System.Drawing.Size(77, 13)
        ADDED_WHENLabel.TabIndex = 16
        ADDED_WHENLabel.Text = "Erstellt wann:"
        '
@@ -161,7 +160,7 @@ Partial Class frmAdmin_Start
        ADDED_WHOLabel.AutoSize = True
        ADDED_WHOLabel.Location = New System.Drawing.Point(351, 146)
        ADDED_WHOLabel.Name = "ADDED_WHOLabel"
-        ADDED_WHOLabel.Size = New System.Drawing.Size(65, 13)
+        ADDED_WHOLabel.Size = New System.Drawing.Size(67, 13)
        ADDED_WHOLabel.TabIndex = 14
        ADDED_WHOLabel.Text = "Erstellt wer:"
        '
@@ -170,7 +169,7 @@ Partial Class frmAdmin_Start
        COMMENTLabel.AutoSize = True
        COMMENTLabel.Location = New System.Drawing.Point(351, 106)
        COMMENTLabel.Name = "COMMENTLabel"
-        COMMENTLabel.Size = New System.Drawing.Size(65, 13)
+        COMMENTLabel.Size = New System.Drawing.Size(68, 13)
        COMMENTLabel.TabIndex = 12
        COMMENTLabel.Text = "Kommentar:"
        '
@@ -179,7 +178,7 @@ Partial Class frmAdmin_Start
        VIEW_SEQUENCELabel.AutoSize = True
        VIEW_SEQUENCELabel.Location = New System.Drawing.Point(351, 82)
        VIEW_SEQUENCELabel.Name = "VIEW_SEQUENCELabel"
-        VIEW_SEQUENCELabel.Size = New System.Drawing.Size(93, 13)
+        VIEW_SEQUENCELabel.Size = New System.Drawing.Size(101, 13)
        VIEW_SEQUENCELabel.TabIndex = 8
        VIEW_SEQUENCELabel.Text = "View Reihenfolge:"
        '
@@ -188,7 +187,7 @@ Partial Class frmAdmin_Start
        TITLELabel.AutoSize = True
        TITLELabel.Location = New System.Drawing.Point(351, 12)
        TITLELabel.Name = "TITLELabel"
-        TITLELabel.Size = New System.Drawing.Size(71, 13)
+        TITLELabel.Size = New System.Drawing.Size(76, 13)
        TITLELabel.TabIndex = 2
        TITLELabel.Text = "Bezeichnung:"
        '
@@ -197,19 +196,19 @@ Partial Class frmAdmin_Start
        GUIDLabel.AutoSize = True
        GUIDLabel.Location = New System.Drawing.Point(297, 12)
        GUIDLabel.Name = "GUIDLabel"
-        GUIDLabel.Size = New System.Drawing.Size(36, 13)
+        GUIDLabel.Size = New System.Drawing.Size(37, 13)
        GUIDLabel.TabIndex = 0
        GUIDLabel.Text = "GUID:"
        '
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemSaveAttribute, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 11
+        Me.RibbonControl1.MaxItemId = 14
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage_ClipboardWatcher, Me.RibbonPage_GlobalIndexer, Me.RibbonPage_IDB})
-        Me.RibbonControl1.Size = New System.Drawing.Size(1328, 157)
+        Me.RibbonControl1.Size = New System.Drawing.Size(1328, 159)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
        'BarButtonItem1
@@ -266,18 +265,11 @@ Partial Class frmAdmin_Start
        Me.labelError.Name = "labelError"
        Me.labelError.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
        '
-        'BarButtonItemSaveAttribute
-        '
-        Me.BarButtonItemSaveAttribute.Caption = "Speichern"
-        Me.BarButtonItemSaveAttribute.Id = 8
-        Me.BarButtonItemSaveAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemSaveAttribute.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItemSaveAttribute.Name = "BarButtonItemSaveAttribute"
-        '
        'BarButtonItemAddAttribute
        '
        Me.BarButtonItemAddAttribute.Caption = "Hinzufügen"
        Me.BarButtonItemAddAttribute.Id = 9
-        Me.BarButtonItemAddAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemAddAttribute.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItemAddAttribute.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_addcircled1
        Me.BarButtonItemAddAttribute.Name = "BarButtonItemAddAttribute"
        '
        'BarButtonItemRefreshAttribute
@@ -286,18 +278,35 @@ Partial Class frmAdmin_Start
        Me.BarButtonItemRefreshAttribute.Id = 10
        Me.BarButtonItemRefreshAttribute.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItemRefreshAttribute.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.BarButtonItemRefreshAttribute.Name = "BarButtonItemRefreshAttribute"
+        Me.BarButtonItemRefreshAttribute.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
+        '
+        'BarButtonItem6
+        '
+        Me.BarButtonItem6.Caption = "Neues Attribut"
+        Me.BarButtonItem6.Id = 11
+        Me.BarButtonItem6.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_addcircled
+        Me.BarButtonItem6.Name = "BarButtonItem6"
+        '
+        'BarButtonItem7
+        '
+        Me.BarButtonItem7.Caption = "Bearbeiten"
+        Me.BarButtonItem7.Id = 12
+        Me.BarButtonItem7.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_edit
+        Me.BarButtonItem7.Name = "BarButtonItem7"
+        '
+        'BarButtonItem8
+        '
+        Me.BarButtonItem8.Caption = "Löschen"
+        Me.BarButtonItem8.Id = 13
+        Me.BarButtonItem8.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_deletecircled
+        Me.BarButtonItem8.Name = "BarButtonItem8"
+        Me.BarButtonItem8.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText
        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "Start"
        '
-        'RibbonPageGroup2
-        '
-        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
-        Me.RibbonPageGroup2.Text = "RibbonPageGroup2"
-        '
        'RibbonPage_ClipboardWatcher
        '
        Me.RibbonPage_ClipboardWatcher.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonGroup_ClipboardWatcher_Profile, Me.RibbonGroup_ClipboardWatcher_DocSearch, Me.RibbonGroup_ClipboardWatcher_DataSearch, Me.RibbonGroup_ClipboardWatcher_Process, Me.RibbonGroup_ClipboardWatcher_Window, Me.RibbonGroup_ClipboardWatcher_Control})
@@ -360,9 +369,10 @@ Partial Class frmAdmin_Start
        '
        'RibbonPageGroupAttributes
        '
-        Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItemSaveAttribute)
        Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItemAddAttribute)
+        Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItem7)
        Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItemRefreshAttribute)
+        Me.RibbonPageGroupAttributes.ItemLinks.Add(Me.BarButtonItem8)
        Me.RibbonPageGroupAttributes.Name = "RibbonPageGroupAttributes"
        Me.RibbonPageGroupAttributes.Text = "Attribute"
        '
@@ -402,7 +412,7 @@ Partial Class frmAdmin_Start
        Me.TreeListMenu.OptionsView.ShowIndicator = False
        Me.TreeListMenu.OptionsView.ShowVertLines = False
        Me.TreeListMenu.SelectImageList = Me.SvgImageCollection1
-        Me.TreeListMenu.Size = New System.Drawing.Size(193, 523)
+        Me.TreeListMenu.Size = New System.Drawing.Size(193, 521)
        Me.TreeListMenu.TabIndex = 8
        '
        'TreeListColumn1
@@ -430,10 +440,10 @@ Partial Class frmAdmin_Start
        Me.DockPanel1.Controls.Add(Me.DockPanel1_Container)
        Me.DockPanel1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Left
        Me.DockPanel1.ID = New System.Guid("ce81b5b5-eff5-4006-8018-548aa8413799")
-        Me.DockPanel1.Location = New System.Drawing.Point(0, 157)
+        Me.DockPanel1.Location = New System.Drawing.Point(0, 159)
        Me.DockPanel1.Name = "DockPanel1"
        Me.DockPanel1.OriginalSize = New System.Drawing.Size(200, 200)
-        Me.DockPanel1.Size = New System.Drawing.Size(200, 572)
+        Me.DockPanel1.Size = New System.Drawing.Size(200, 570)
        Me.DockPanel1.Text = "Übersicht"
        '
        'DockPanel1_Container
@@ -441,7 +451,7 @@ Partial Class frmAdmin_Start
        Me.DockPanel1_Container.Controls.Add(Me.TreeListMenu)
        Me.DockPanel1_Container.Location = New System.Drawing.Point(3, 46)
        Me.DockPanel1_Container.Name = "DockPanel1_Container"
-        Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 523)
+        Me.DockPanel1_Container.Size = New System.Drawing.Size(193, 521)
        Me.DockPanel1_Container.TabIndex = 0
        '
        'TBIDB_ATTRIBUTEBindingSource
@@ -457,7 +467,16 @@ Partial Class frmAdmin_Start
        'TBIDB_ATTRIBUTETableAdapter
        '
        Me.TBIDB_ATTRIBUTETableAdapter.ClearBeforeFill = True
-        '        '
+        '
+        'TableAdapterManager
+        '
+        Me.TableAdapterManager.BackupDataSetBeforeUpdate = False
+        Me.TableAdapterManager.Connection = Nothing
+        Me.TableAdapterManager.TBIDB_ATTRIBUTE_TYPETableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_ATTRIBUTETableAdapter = Nothing
+        Me.TableAdapterManager.TBIDB_BUSINESS_ENTITYTableAdapter = Nothing
+        Me.TableAdapterManager.UpdateOrder = DigitalData.GUIs.ZooFlow.DSIDB_StammdatenTableAdapters.TableAdapterManager.UpdateOrderOption.InsertUpdateDelete
+        '
        'TBIDB_ATTRIBUTE_TYPEBindingSource
        '
        Me.TBIDB_ATTRIBUTE_TYPEBindingSource.DataMember = "TBIDB_ATTRIBUTE_TYPE"
@@ -471,7 +490,7 @@ Partial Class frmAdmin_Start
        '
        Me.XtraTabPage_IDB.Controls.Add(Me.XtraTabControlIDB)
        Me.XtraTabPage_IDB.Name = "XtraTabPage_IDB"
-        Me.XtraTabPage_IDB.Size = New System.Drawing.Size(1126, 549)
+        Me.XtraTabPage_IDB.Size = New System.Drawing.Size(1126, 547)
        Me.XtraTabPage_IDB.Text = "IDB"
        '
        'XtraTabControlIDB
@@ -480,7 +499,7 @@ Partial Class frmAdmin_Start
        Me.XtraTabControlIDB.Location = New System.Drawing.Point(0, 0)
        Me.XtraTabControlIDB.Name = "XtraTabControlIDB"
        Me.XtraTabControlIDB.SelectedTabPage = Me.XtraTabPageIDB_Attributes_New
-        Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 549)
+        Me.XtraTabControlIDB.Size = New System.Drawing.Size(1126, 547)
        Me.XtraTabControlIDB.TabIndex = 0
        Me.XtraTabControlIDB.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageIDB_Attributes_New, Me.XtraTabPageIDB_Attributes, Me.XtraTabPage2})
        '
@@ -488,7 +507,7 @@ Partial Class frmAdmin_Start
        '
        Me.XtraTabPageIDB_Attributes_New.Controls.Add(Me.GridAttributes)
        Me.XtraTabPageIDB_Attributes_New.Name = "XtraTabPageIDB_Attributes_New"
-        Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 526)
+        Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 524)
        Me.XtraTabPageIDB_Attributes_New.Text = "Attribute"
        '
        'GridAttributes
@@ -498,7 +517,7 @@ Partial Class frmAdmin_Start
        Me.GridAttributes.MainView = Me.ViewAttributes
        Me.GridAttributes.MenuManager = Me.RibbonControl1
        Me.GridAttributes.Name = "GridAttributes"
-        Me.GridAttributes.Size = New System.Drawing.Size(1124, 526)
+        Me.GridAttributes.Size = New System.Drawing.Size(1124, 524)
        Me.GridAttributes.TabIndex = 0
        Me.GridAttributes.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewAttributes})
        '
@@ -532,7 +551,7 @@ Partial Class frmAdmin_Start
        Me.XtraTabPageIDB_Attributes.Controls.Add(CHANGED_WHENLabel)
        Me.XtraTabPageIDB_Attributes.Controls.Add(Me.CHANGED_WHENTextBox)
        Me.XtraTabPageIDB_Attributes.Name = "XtraTabPageIDB_Attributes"
-        Me.XtraTabPageIDB_Attributes.Size = New System.Drawing.Size(1124, 526)
+        Me.XtraTabPageIDB_Attributes.Size = New System.Drawing.Size(1124, 524)
        Me.XtraTabPageIDB_Attributes.Text = "Attributverwaltung"
        '
        'ComboBox1
@@ -551,7 +570,7 @@ Partial Class frmAdmin_Start
        Me.GridControl1.MainView = Me.GridView1
        Me.GridControl1.MenuManager = Me.RibbonControl1
        Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(282, 526)
+        Me.GridControl1.Size = New System.Drawing.Size(282, 524)
        Me.GridControl1.TabIndex = 28
        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
        '
@@ -597,7 +616,7 @@ Partial Class frmAdmin_Start
        Me.GUIDTextBox.Location = New System.Drawing.Point(300, 28)
        Me.GUIDTextBox.Name = "GUIDTextBox"
        Me.GUIDTextBox.ReadOnly = True
-        Me.GUIDTextBox.Size = New System.Drawing.Size(33, 21)
+        Me.GUIDTextBox.Size = New System.Drawing.Size(33, 22)
        Me.GUIDTextBox.TabIndex = 1
        '
        'TITLETextBox
@@ -605,7 +624,7 @@ Partial Class frmAdmin_Start
        Me.TITLETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "TITLE", True))
        Me.TITLETextBox.Location = New System.Drawing.Point(354, 28)
        Me.TITLETextBox.Name = "TITLETextBox"
-        Me.TITLETextBox.Size = New System.Drawing.Size(290, 21)
+        Me.TITLETextBox.Size = New System.Drawing.Size(290, 22)
        Me.TITLETextBox.TabIndex = 3
        '
        'TYP_IDTextBox
@@ -613,7 +632,7 @@ Partial Class frmAdmin_Start
        Me.TYP_IDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "TYP_ID", True))
        Me.TYP_IDTextBox.Location = New System.Drawing.Point(777, 28)
        Me.TYP_IDTextBox.Name = "TYP_IDTextBox"
-        Me.TYP_IDTextBox.Size = New System.Drawing.Size(104, 21)
+        Me.TYP_IDTextBox.Size = New System.Drawing.Size(104, 22)
        Me.TYP_IDTextBox.TabIndex = 5
        '
        'MULTI_CONTEXTCheckBox
@@ -631,7 +650,7 @@ Partial Class frmAdmin_Start
        Me.VIEW_SEQUENCETextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "VIEW_SEQUENCE", True))
        Me.VIEW_SEQUENCETextBox.Location = New System.Drawing.Point(450, 79)
        Me.VIEW_SEQUENCETextBox.Name = "VIEW_SEQUENCETextBox"
-        Me.VIEW_SEQUENCETextBox.Size = New System.Drawing.Size(33, 21)
+        Me.VIEW_SEQUENCETextBox.Size = New System.Drawing.Size(33, 22)
        Me.VIEW_SEQUENCETextBox.TabIndex = 9
        '
        'VIEW_VISIBLECheckBox
@@ -649,7 +668,7 @@ Partial Class frmAdmin_Start
        Me.COMMENTTextBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBIDB_ATTRIBUTEBindingSource, "COMMENT", True))
        Me.COMMENTTextBox.Location = New System.Drawing.Point(354, 122)
        Me.COMMENTTextBox.Name = "COMMENTTextBox"
-        Me.COMMENTTextBox.Size = New System.Drawing.Size(417, 21)
+        Me.COMMENTTextBox.Size = New System.Drawing.Size(417, 22)
        Me.COMMENTTextBox.TabIndex = 13
        '
        'ADDED_WHOTextBox
@@ -658,7 +677,7 @@ Partial Class frmAdmin_Start
        Me.ADDED_WHOTextBox.Location = New System.Drawing.Point(354, 164)
        Me.ADDED_WHOTextBox.Name = "ADDED_WHOTextBox"
        Me.ADDED_WHOTextBox.ReadOnly = True
-        Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(104, 21)
+        Me.ADDED_WHOTextBox.Size = New System.Drawing.Size(104, 22)
        Me.ADDED_WHOTextBox.TabIndex = 15
        '
        'ADDED_WHENTextBox
@@ -667,7 +686,7 @@ Partial Class frmAdmin_Start
        Me.ADDED_WHENTextBox.Location = New System.Drawing.Point(475, 164)
        Me.ADDED_WHENTextBox.Name = "ADDED_WHENTextBox"
        Me.ADDED_WHENTextBox.ReadOnly = True
-        Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(131, 21)
+        Me.ADDED_WHENTextBox.Size = New System.Drawing.Size(131, 22)
        Me.ADDED_WHENTextBox.TabIndex = 17
        '
        'CHANGED_WHOTextBox
@@ -676,7 +695,7 @@ Partial Class frmAdmin_Start
        Me.CHANGED_WHOTextBox.Location = New System.Drawing.Point(354, 204)
        Me.CHANGED_WHOTextBox.Name = "CHANGED_WHOTextBox"
        Me.CHANGED_WHOTextBox.ReadOnly = True
-        Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(104, 21)
+        Me.CHANGED_WHOTextBox.Size = New System.Drawing.Size(104, 22)
        Me.CHANGED_WHOTextBox.TabIndex = 19
        '
        'CHANGED_WHENTextBox
@@ -685,41 +704,41 @@ Partial Class frmAdmin_Start
        Me.CHANGED_WHENTextBox.Location = New System.Drawing.Point(475, 204)
        Me.CHANGED_WHENTextBox.Name = "CHANGED_WHENTextBox"
        Me.CHANGED_WHENTextBox.ReadOnly = True
-        Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(131, 21)
+        Me.CHANGED_WHENTextBox.Size = New System.Drawing.Size(131, 22)
        Me.CHANGED_WHENTextBox.TabIndex = 21
        '
        'XtraTabPage2
        '
        Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(1124, 526)
+        Me.XtraTabPage2.Size = New System.Drawing.Size(1124, 524)
        Me.XtraTabPage2.Text = "XtraTabPage2"
        '
        'XtraTabPage_GlobalIndexer
        '
        Me.XtraTabPage_GlobalIndexer.Name = "XtraTabPage_GlobalIndexer"
        Me.XtraTabPage_GlobalIndexer.PageVisible = False
-        Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 549)
+        Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 547)
        Me.XtraTabPage_GlobalIndexer.Text = "Global Indexer"
        '
        'XtraTabPage_ClipboardWatcher
        '
        Me.XtraTabPage_ClipboardWatcher.Name = "XtraTabPage_ClipboardWatcher"
        Me.XtraTabPage_ClipboardWatcher.PageVisible = False
-        Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(1126, 549)
+        Me.XtraTabPage_ClipboardWatcher.Size = New System.Drawing.Size(1126, 547)
        Me.XtraTabPage_ClipboardWatcher.Text = "Clipboard Watcher"
        '
        'XtraTabControl
        '
        Me.XtraTabControl.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.XtraTabControl.Location = New System.Drawing.Point(200, 157)
+        Me.XtraTabControl.Location = New System.Drawing.Point(200, 159)
        Me.XtraTabControl.Name = "XtraTabControl"
        Me.XtraTabControl.SelectedTabPage = Me.XtraTabPage_IDB
        Me.XtraTabControl.ShowTabHeader = DevExpress.Utils.DefaultBoolean.[True]
-        Me.XtraTabControl.Size = New System.Drawing.Size(1128, 572)
+        Me.XtraTabControl.Size = New System.Drawing.Size(1128, 570)
        Me.XtraTabControl.TabIndex = 4
        Me.XtraTabControl.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage_ClipboardWatcher, Me.XtraTabPage_GlobalIndexer, Me.XtraTabPage_IDB})
        '
-        'frmAdministrationZooFlow
+        'frmAdmin_Start
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -728,8 +747,8 @@ Partial Class frmAdmin_Start
        Me.Controls.Add(Me.DockPanel1)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.RibbonControl1)
-        Me.IconOptions.SvgImage = CType(resources.GetObject("frmAdministrationZooFlow.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.Name = "frmAdministrationZooFlow"
+        Me.IconOptions.SvgImage = CType(resources.GetObject("frmAdmin_Start.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.Name = "frmAdmin_Start"
        Me.Ribbon = Me.RibbonControl1
        Me.StatusBar = Me.RibbonStatusBar1
        Me.Text = "Administration"
@@ -752,8 +771,6 @@ Partial Class frmAdmin_Start
        Me.XtraTabPageIDB_Attributes.PerformLayout()
        CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.XtraTabPage_GlobalIndexer.ResumeLayout(False)
-        Me.XtraTabPage_ClipboardWatcher.ResumeLayout(False)
        CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit()
        Me.XtraTabControl.ResumeLayout(False)
        Me.ResumeLayout(False)
@@ -785,7 +802,6 @@ Partial Class frmAdmin_Start
    Friend WithEvents RibbonPage_GlobalIndexer As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents labelError As DevExpress.XtraBars.BarStaticItem
    Friend WithEvents TBIDB_ATTRIBUTEBindingSource As BindingSource
@@ -797,7 +813,6 @@ Partial Class frmAdmin_Start
    Friend WithEvents DELETED_WHENTextBox As TextBox
    Friend WithEvents TBIDB_ATTRIBUTE_TYPEBindingSource As BindingSource
    Friend WithEvents TBIDB_ATTRIBUTE_TYPETableAdapter As DSIDB_StammdatenTableAdapters.TBIDB_ATTRIBUTE_TYPETableAdapter
-    Friend WithEvents BarButtonItemSaveAttribute As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItemAddAttribute As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPage_IDB As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroupAttributes As DevExpress.XtraBars.Ribbon.RibbonPageGroup
@@ -829,4 +844,7 @@ Partial Class frmAdmin_Start
    Friend WithEvents CHANGED_WHOTextBox As TextBox
    Friend WithEvents CHANGED_WHENTextBox As TextBox
    Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem
 End Class
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx
@@ -268,41 +268,6 @@
        MTYsMjRjLTEuMSwwLTItMC45LTItMmMwLTEuMSwwLjktMiwyLTIgICBzMiwwLjksMiwyQzE4LDIzLjEs
        MTcuMSwyNCwxNiwyNHogTTE4LDE4aC00VjhoNFYxOHoiIGNsYXNzPSJSZWQiIC8+DQogIDwvZz4NCjwv
        c3ZnPgs=
-</value>
-  </data>
-  <data name="BarButtonItemSaveAttribute.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
-        MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
-        bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww
-        LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt
-        NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si
-        IC8+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="BarButtonItemAddAttribute.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKcCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
-        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
-        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
-        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IkFkZCI+DQogICAgPHBhdGggZD0iTTI3LDE0aC05VjVj
-        MC0wLjUtMC41LTEtMS0xaC0yYy0wLjUsMC0xLDAuNS0xLDF2OUg1Yy0wLjUsMC0xLDAuNS0xLDF2MmMw
-        LDAuNSwwLjUsMSwxLDFoOXY5ICAgYzAsMC41LDAuNSwxLDEsMWgyYzAuNSwwLDEtMC41LDEtMXYtOWg5
-        YzAuNSwwLDEtMC41LDEtMXYtMkMyOCwxNC41LDI3LjUsMTQsMjcsMTR6IiBjbGFzcz0iR3JlZW4iIC8+
-        DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
  </data>
  <data name="BarButtonItemRefreshAttribute.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -338,7 +303,7 @@
  <metadata name="DSIDB_Stammdaten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>487, 21</value>
  </metadata>
-  <data name="frmAdministrationZooFlow.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="frmAdmin_Start.IconOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -361,6 +326,9 @@
        LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
 </value>
  </data>
+  <metadata name="DSIDB_Stammdaten.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>487, 21</value>
+  </metadata>
  <metadata name="TBIDB_ATTRIBUTETableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>875, 21</value>
  </metadata>
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
@@ -8,15 +8,15 @@ Imports DevExpress.XtraTab
 Imports DigitalData.Modules.Logging

 Public Class frmAdmin_Start
+    Inherits frmAdmin_Base
+
    Private Const IDB_START = "IDB_START"
    Private Const IDB_ATTRIBUTES = "IDB_ATTRIBUTES"
    Private Const IDB_BUSINESS_ENTITY = "IDB_BUSINESS_ENTITY"
    Private Const GLOBIX = "GLOBIX"
    Private Const CLIPBOARD_WATCHER = "CLIPBOARD_WATCHER"

-    Private Logger As Logger
    Private PrimaryKey As String = Nothing
-
    Private SourceCommands As New Dictionary(Of String, SourceSql)
    Private CurrentPage As String

@@ -28,8 +28,6 @@ Public Class frmAdmin_Start
    End Class

    Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Logger = My.LogConfig.GetLogger
-
        Load_SourceSql()

        TreeListMenu.ExpandAll()
@@ -62,7 +60,7 @@ Public Class frmAdmin_Start
                End If
            Next
        Catch ex As Exception
-            Logger.Error(ex)
+            ShowError(ex)
        End Try
    End Sub

@@ -76,41 +74,46 @@ Public Class frmAdmin_Start
                End If
            Next
        Catch ex As Exception
-            Logger.Error(ex)
+            ShowError(ex)
        End Try
    End Sub

    Private Sub TreeList1_FocusedNodeChanged(sender As Object, e As DevExpress.XtraTreeList.FocusedNodeChangedEventArgs) Handles TreeListMenu.FocusedNodeChanged
-        If e.Node Is Nothing OrElse e.Node.Tag Is Nothing Then
-            Exit Sub
-        End If
+        Try
+            If e.Node Is Nothing OrElse e.Node.Tag Is Nothing Then
+                Exit Sub
+            End If

-        CurrentPage = e.Node.Tag.ToString
-        Dim oSource As SourceSql = SourceCommands.Item(CurrentPage)
+            CurrentPage = e.Node.Tag.ToString
+            Dim oSource As SourceSql = SourceCommands.Item(CurrentPage)

-        Select Case e.Node.Tag.ToString
-            Case IDB_START
-                Display_Tab(XtraTabPage_IDB, XtraTabControl)
+            Select Case e.Node.Tag.ToString
+                Case IDB_START
+                    Display_Tab(XtraTabPage_IDB, XtraTabControl)

-            Case IDB_ATTRIBUTES
-                Display_Tab(XtraTabPage_IDB, XtraTabControl)
-                Display_Tab(XtraTabPageIDB_Attributes_New, XtraTabControlIDB)
+                Case IDB_ATTRIBUTES
+                    Display_Tab(XtraTabPage_IDB, XtraTabControl)
+                    Display_Tab(XtraTabPageIDB_Attributes_New, XtraTabControlIDB)

-                Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL)
-                Load_Grid(oTable, oSource.PrimaryKey, GridAttributes)
+                    Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL)
+                    Load_Grid(oTable, oSource.PrimaryKey, GridAttributes)

-            Case IDB_BUSINESS_ENTITY
+                Case IDB_BUSINESS_ENTITY
                'DisplayTab(XtraTabPage_Entities)

-            Case GLOBIX
-                Display_Tab(XtraTabPage_GlobalIndexer, XtraTabControl)
-                Display_RibbonPage(RibbonPage_GlobalIndexer)
+                Case GLOBIX
+                    Display_Tab(XtraTabPage_GlobalIndexer, XtraTabControl)
+                    Display_RibbonPage(RibbonPage_GlobalIndexer)

-            Case CLIPBOARD_WATCHER
-                Display_Tab(XtraTabPage_ClipboardWatcher, XtraTabControl)
-                Display_RibbonPage(RibbonPage_ClipboardWatcher)
+                Case CLIPBOARD_WATCHER
+                    Display_Tab(XtraTabPage_ClipboardWatcher, XtraTabControl)
+                    Display_RibbonPage(RibbonPage_ClipboardWatcher)
+
+            End Select
+        Catch ex As Exception
+            ShowError(ex)
+        End Try

-        End Select
    End Sub

    Private Sub Load_Grid(DataSource As DataTable, PrimaryKey As String, GridControl As GridControl)
@@ -122,20 +125,55 @@ Public Class frmAdmin_Start

            Dim oGridView = DirectCast(GridControl.DefaultView, GridView)

+            With oGridView.Appearance.EvenRow
+                .BackColor = Color.Gainsboro
+                .Options.UseBackColor = True
+            End With
+
+            With oGridView.Appearance.FocusedCell
+                .BackColor = Color.Gold
+                .Options.UseBackColor = True
+            End With
+
+            With oGridView.Appearance.FocusedRow
+                .BackColor = Color.Gold
+                .Options.UseBackColor = True
+            End With
+
            With oGridView.OptionsBehavior
                .Editable = False
                .ReadOnly = True
            End With

+            With oGridView.OptionsClipboard
+                .CopyColumnHeaders = DefaultBoolean.False
+            End With
+
+            With oGridView.OptionsFind
+                .AlwaysVisible = True
+            End With
+
            With oGridView.OptionsView
                .ShowAutoFilterRow = True
+                .EnableAppearanceEvenRow = True
+                .ShowIndicator = False
            End With

+            AddHandler oGridView.KeyDown, Sub(sender As Object, e As KeyEventArgs)
+                                              Dim oView As GridView = DirectCast(sender, GridView)
+                                              If e.Control AndAlso e.KeyCode = Keys.C And e.Modifiers = Keys.Control Then
+                                                  Dim oCellValue = oView.GetRowCellValue(oView.FocusedRowHandle, oView.FocusedColumn)
+                                                  If oCellValue IsNot Nothing AndAlso oCellValue.ToString() <> String.Empty Then
+                                                      Clipboard.SetText(oCellValue.ToString)
+                                                  End If
+                                                  e.Handled = True
+                                              End If
+                                          End Sub
+
            oGridView.BestFitColumns()

        Catch ex As Exception
-            MsgBox("Fehler beim Laden.", MsgBoxStyle.Critical, Text)
-            Logger.Error(ex)
+            ShowError(ex)
        End Try
    End Sub

@@ -145,21 +183,40 @@ Public Class frmAdmin_Start
        If hitInfo.InDataRow Then
            Try
                Dim oRow As DataRow = ViewAttributes.GetFocusedDataRow
-                Dim oPrimaryKey As Integer = oRow.Item(PrimaryKey)
-                Dim oForm As New frmAdmin_Attribute(oPrimaryKey)
-
-                GridView1.ShowLoadingPanel()
-                oForm.ShowDialog()
-                GridView1.HideLoadingPanel()
-
-                If oForm.HasChanges Then
-                    Dim oSource As SourceSql = SourceCommands.Item(CurrentPage)
-                    Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL)
-                    Load_Grid(oTable, oSource.PrimaryKey, GridAttributes)
+                If oRow IsNot Nothing Then
+                    Dim oPrimaryKey As Integer = oRow.Item(PrimaryKey)
+                    LoadAttribute(oPrimaryKey)
                End If
            Catch ex As Exception
-                Logger.Error(ex)
+                ShowError(ex)
            End Try
        End If
    End Sub
+
+    Private Sub LoadAttribute(PrimaryKey As Integer)
+        Try
+            Dim oForm As New frmAdmin_IDBAttribute(PrimaryKey)
+            oForm.ShowDialog()
+
+            If oForm.HasChanges Then
+                Dim oSource As SourceSql = SourceCommands.Item(CurrentPage)
+                Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL)
+                Load_Grid(oTable, oSource.PrimaryKey, GridAttributes)
+            End If
+        Catch ex As Exception
+            ShowError(ex)
+        End Try
+    End Sub
+
+    Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick
+        Try
+            Dim oRow As DataRow = ViewAttributes.GetFocusedDataRow
+            If oRow IsNot Nothing Then
+                Dim oPrimaryKey As Integer = oRow.Item(PrimaryKey)
+                LoadAttribute(oPrimaryKey)
+            End If
+        Catch ex As Exception
+            ShowError(ex)
+        End Try
+    End Sub
 End Class
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -200,6 +200,26 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_addcircled() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_addcircled", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_addcircled1() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_addcircled1", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
@@ -210,6 +230,26 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_deletecircled() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_deletecircled", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property actions_edit() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("actions_edit", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
@@ -230,6 +270,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property bo_document() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("bo_document", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -178,6 +178,12 @@
  <data name="4_GLOBIX_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_deletecircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_deletecircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="2_LUPE_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -190,6 +196,9 @@
  <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="bo_document" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="1_LOGO_ZOO_FLOW_DROP2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -205,6 +214,12 @@
  <data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="actions_addcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_addcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_edit.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="2_LUPE_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -214,7 +229,7 @@
  <data name="2_ZOO_FLOW_Abo" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="about" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\about.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_addcircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/GUIs.ZooFlow/Resources/actions_addcircled.svg
+++ b/GUIs.ZooFlow/Resources/actions_addcircled.svg
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="AddCircled">
+    <path d="M16,4C9.4,4,4,9.4,4,16s5.4,12,12,12s12-5.4,12-12S22.6,4,16,4z M24,18h-6v6h-4v-6H8v-4h6V8h4v6h6V18z" class="Green" />
+  </g>
+</svg>
--- a/GUIs.ZooFlow/Resources/actions_addcircled1.svg
+++ b/GUIs.ZooFlow/Resources/actions_addcircled1.svg
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="AddCircled">
+    <path d="M16,4C9.4,4,4,9.4,4,16s5.4,12,12,12s12-5.4,12-12S22.6,4,16,4z M24,18h-6v6h-4v-6H8v-4h6V8h4v6h6V18z" class="Green" />
+  </g>
+</svg>
--- a/GUIs.ZooFlow/Resources/actions_deletecircled.svg
+++ b/GUIs.ZooFlow/Resources/actions_deletecircled.svg
@@ -0,0 +1,15 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="DeleteCircled">
+    <path d="M16,4C9.4,4,4,9.4,4,16s5.4,12,12,12s12-5.4,12-12S22.6,4,16,4z M23.1,20.2l-2.8,2.8L16,18.8l-4.2,4.2   l-2.8-2.8l4.2-4.2l-4.2-4.2l2.8-2.8l4.2,4.2l4.2-4.2l2.8,2.8L18.8,16L23.1,20.2z" class="Red" />
+  </g>
+</svg>
--- a/GUIs.ZooFlow/Resources/actions_edit.svg
+++ b/GUIs.ZooFlow/Resources/actions_edit.svg
@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Black{fill:#727272;}
+	.Green{fill:#039C23;}
+	.Red{fill:#D11C1C;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+</style>
+  <g id="Edit">
+    <path d="M27.6,8.2l-3.8-3.8c-0.5-0.5-1.4-0.5-1.9,0l-2.5,2.5l5.8,5.8l2.5-2.5C28.1,9.6,28.1,8.8,27.6,8.2z" class="Blue" />
+    <polygon points="4,28 9.8,28 4,22.2  " class="Blue" />
+    <rect x="5.8" y="13.4" width="17.6" height="8.2" rx="0" ry="0" class="Blue" transform="matrix(0.707, -0.7072, 0.7072, 0.707, -8.0721, 15.4048)" />
+  </g>
+</svg>
--- a/GUIs.ZooFlow/Resources/bo_document.svg
+++ b/GUIs.ZooFlow/Resources/bo_document.svg
@@ -0,0 +1,26 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Green{fill:#039C23;}
+	.Black{fill:#727272;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+	.st2{display:none;}
+	.st3{display:inline;fill:#FFB115;}
+	.st4{display:inline;}
+	.st5{display:inline;opacity:0.75;}
+	.st6{display:inline;opacity:0.5;}
+	.st7{display:inline;fill:#039C23;}
+	.st8{display:inline;fill:#D11C1C;}
+	.st9{display:inline;fill:#1177D7;}
+	.st10{display:inline;fill:#FFFFFF;}
+</style>
+  <g id="Document_1_">
+    <path d="M15,20l9-9l5,5l-9,9L15,20z M31.7,11.9l-3.6-3.6c-0.4-0.4-1-0.4-1.4,0L25,10l5,5l1.7-1.7   C32.1,12.9,32.1,12.3,31.7,11.9z M14,26h5l-5-5V26z" class="Blue" />
+    <path d="M24,23.8V28h-4.2H12H6V4h18v4.2l2-2V3c0-0.5-0.5-1-1-1H5C4.4,2,4,2.5,4,3v26c0,0.5,0.5,1,1,1h20   c0.5,0,1-0.5,1-1v-7.2L24,23.8z" class="Black" />
+  </g>
+</svg>
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -114,13 +114,16 @@
    <Import Include="System" />
  </ItemGroup>
  <ItemGroup>
-    <Compile Include="Administration\frmAdmin_Attribute.Designer.vb">
-      <DependentUpon>frmAdmin_Attribute.vb</DependentUpon>
-    </Compile>
-    <Compile Include="Administration\frmAdmin_Attribute.vb">
+    <Compile Include="Administration\frmAdmin_Base.vb">
      <SubType>Form</SubType>
    </Compile>
-    <Compile Include="Administration\interfaceAdmin_Form.vb" />
+    <Compile Include="Administration\frmAdmin_IDBAttribute.Designer.vb">
+      <DependentUpon>frmAdmin_IDBAttribute.vb</DependentUpon>
+    </Compile>
+    <Compile Include="Administration\frmAdmin_IDBAttribute.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Administration\frmAdmin_Interface.vb" />
    <Compile Include="ApplicationEvents.vb" />
    <Compile Include="Base\BaseClass.vb" />
    <Compile Include="ClipboardWatcher\ClassProfileLoader.vb" />
@@ -256,8 +259,8 @@
    <Compile Include="Queries\ClassQueries.vb" />
    <Compile Include="Search\SearchFilter.vb" />
    <Compile Include="Search\State.vb" />
-    <EmbeddedResource Include="Administration\frmAdmin_Attribute.resx">
-      <DependentUpon>frmAdmin_Attribute.vb</DependentUpon>
+    <EmbeddedResource Include="Administration\frmAdmin_IDBAttribute.resx">
+      <DependentUpon>frmAdmin_IDBAttribute.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Globix\frmGlobixBasicConfig.resx">
      <DependentUpon>frmGlobixBasicConfig.vb</DependentUpon>
@@ -489,6 +492,21 @@
  <ItemGroup>
    <None Include="Resources\about.svg" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\actions_addcircled.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\bo_document.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\actions_deletecircled.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\actions_edit.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\actions_addcircled1.svg" />
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/Modules.Logging/LogConfig.vb
+++ b/Modules.Logging/LogConfig.vb
@@ -292,7 +292,7 @@ Public Class LogConfig
    ''' <returns>The fully qualified class name</returns>
    ''' <remarks>This method is very resource-intensive!</remarks>
    <DebuggerStepThrough()>
-    Public Shared Function GetClassFullName() As String
+    Public Shared Function GetClassFullName(Optional IncludeMethodNames As Boolean = False) As String
        Dim oFramesToSkip As Integer = 2
        Dim oClassName As String = String.Empty
        Dim oStackTrace = Environment.StackTrace
@@ -303,6 +303,10 @@ Public Class LogConfig
            Dim oMethodStartIndex As Integer = oCallingClassAndMethod.LastIndexOf(".", StringComparison.Ordinal)

            If oMethodStartIndex > 0 Then
+                If IncludeMethodNames Then
+                    oMethodStartIndex = oCallingClassAndMethod.Count
+                End If
+
                Dim oCallingClass = oCallingClassAndMethod.Substring(0, oMethodStartIndex)
                oClassName = oCallingClass.TrimEnd("."c)
Author	SHA1	Message	Date
Jonathan Jenne	403c87bde7	ZooFlow: Add Base Form	2021-02-12 12:50:04 +01:00
Jonathan Jenne	4108410b15	ZooFlow: Finishing Attribute Form	2021-02-12 11:28:25 +01:00