ZooFlow: Add Base Form

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

GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.Designer.vb

@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmAdmin_IDBAttribute
-    Inherits DevExpress.XtraBars.Ribbon.RibbonForm
+    Inherits frmAdmin_Base
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
     <System.Diagnostics.DebuggerNonUserCode()>

GUIs.ZooFlow/Administration/frmAdmin_IDBAttribute.vb

@@ -1,12 +1,13 @@
 Imports DigitalData.Modules.Logging
 
 Public Class frmAdmin_IDBAttribute
-    Implements interfaceAdmin_Form
+    Inherits frmAdmin_Base
+    Implements frmAdmin_Interface
 
-    Private Property Logger As Logger Implements interfaceAdmin_Form.Logger
+    Private Property Logger As Logger Implements frmAdmin_Interface.Logger
-    Public Property HasChanges As Boolean = False Implements interfaceAdmin_Form.HasChanges
+    Public Property HasChanges As Boolean = False Implements frmAdmin_Interface.HasChanges
-    Public Property IsInsert As Boolean = False Implements interfaceAdmin_Form.IsInsert
+    Public Property IsInsert As Boolean = False Implements frmAdmin_Interface.IsInsert
-    Public Property PrimaryKey As Integer Implements interfaceAdmin_Form.PrimaryKey
+    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_IDBAttribute
         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_IDBAttribute
         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()
 
@@ -70,7 +71,7 @@ Public Class frmAdmin_IDBAttribute
 
             Return True
         Catch ex As Exception
-            Logger.Error(ex)
+            ShowError(ex)
             Return False
         End Try
     End Function

GUIs.ZooFlow/Administration/frmAdmin_Interface.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

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,14 +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()
@@ -205,7 +203,7 @@ Partial Class frmAdmin_Start
         '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.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8})
+        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 = 14
         Me.RibbonControl1.Name = "RibbonControl1"
@@ -267,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
@@ -287,6 +278,7 @@ 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
         '
@@ -308,21 +300,13 @@ Partial Class frmAdmin_Start
         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.ItemLinks.Add(Me.BarButtonItem6)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem7)
-        Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem8)
-        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
-        Me.RibbonPageGroup2.Text = "Attribute"
-        '
         '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})
@@ -385,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"
         '
@@ -817,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
@@ -829,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

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">

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
+        Try
-            Exit Sub
+            If e.Node Is Nothing OrElse e.Node.Tag Is Nothing Then
-        End If
+                Exit Sub
+            End If
 
-        CurrentPage = e.Node.Tag.ToString
+            CurrentPage = e.Node.Tag.ToString
-        Dim oSource As SourceSql = SourceCommands.Item(CurrentPage)
+            Dim oSource As SourceSql = SourceCommands.Item(CurrentPage)
 
-        Select Case e.Node.Tag.ToString
+            Select Case e.Node.Tag.ToString
-            Case IDB_START
+                Case IDB_START
-                Display_Tab(XtraTabPage_IDB, XtraTabControl)
+                    Display_Tab(XtraTabPage_IDB, XtraTabControl)
 
-            Case IDB_ATTRIBUTES
+                Case IDB_ATTRIBUTES
-                Display_Tab(XtraTabPage_IDB, XtraTabControl)
+                    Display_Tab(XtraTabPage_IDB, XtraTabControl)
-                Display_Tab(XtraTabPageIDB_Attributes_New, XtraTabControlIDB)
+                    Display_Tab(XtraTabPageIDB_Attributes_New, XtraTabControlIDB)
 
-                Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL)
+                    Dim oTable As DataTable = My.Database.GetDatatable(oSource.SQL)
-                Load_Grid(oTable, oSource.PrimaryKey, GridAttributes)
+                    Load_Grid(oTable, oSource.PrimaryKey, GridAttributes)
 
-            Case IDB_BUSINESS_ENTITY
+                Case IDB_BUSINESS_ENTITY
                 'DisplayTab(XtraTabPage_Entities)
 
-            Case GLOBIX
+                Case GLOBIX
-                Display_Tab(XtraTabPage_GlobalIndexer, XtraTabControl)
+                    Display_Tab(XtraTabPage_GlobalIndexer, XtraTabControl)
-                Display_RibbonPage(RibbonPage_GlobalIndexer)
+                    Display_RibbonPage(RibbonPage_GlobalIndexer)
 
-            Case CLIPBOARD_WATCHER
+                Case CLIPBOARD_WATCHER
-                Display_Tab(XtraTabPage_ClipboardWatcher, XtraTabControl)
+                    Display_Tab(XtraTabPage_ClipboardWatcher, XtraTabControl)
-                Display_RibbonPage(RibbonPage_ClipboardWatcher)
+                    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)
@@ -170,8 +173,7 @@ Public Class frmAdmin_Start
             oGridView.BestFitColumns()
 
         Catch ex As Exception
-            MsgBox("Fehler beim Laden.", MsgBoxStyle.Critical, Text)
+            ShowError(ex)
-            Logger.Error(ex)
         End Try
     End Sub
 
@@ -181,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)
+                If oRow IsNot Nothing Then
-                Dim oForm As New frmAdmin_IDBAttribute(oPrimaryKey)
+                    Dim oPrimaryKey As Integer = oRow.Item(PrimaryKey)
-
+                    LoadAttribute(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)
                 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

GUIs.ZooFlow/My Project/Resources.Designer.vb

@@ -210,6 +210,16 @@ Namespace My.Resources
             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>

GUIs.ZooFlow/My Project/Resources.resx

@@ -217,6 +217,9 @@
   <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>
@@ -226,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="actions_edit" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="actions_addcircled1" 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>
+    <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>

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>

GUIs.ZooFlow/ZooFlow.vbproj

@@ -114,13 +114,16 @@
     <Import Include="System" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Administration\frmAdmin_Base.vb">
+      <SubType>Form</SubType>
+    </Compile>
     <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\interfaceAdmin_Form.vb" />
+    <Compile Include="Administration\frmAdmin_Interface.vb" />
     <Compile Include="ApplicationEvents.vb" />
     <Compile Include="Base\BaseClass.vb" />
     <Compile Include="ClipboardWatcher\ClassProfileLoader.vb" />
@@ -501,6 +504,9 @@
   <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.

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)