ZooFlow: Update Zooflow Form, Globix Tweaks

EDMIService: Small tweaks for AppServer
Logging: Version 2.4.0
2021-06-17 13:12:12 +02:00 · 2021-06-17 13:11:39 +02:00 · 2021-06-17 13:10:58 +02:00 · 2021-06-17 13:05:29 +02:00 · 2021-06-17 13:03:10 +02:00 · 2021-06-17 12:58:42 +02:00
34 changed files with 1314 additions and 803 deletions
--- a/Controls.DocumentViewer/DocumentViewer.vb
+++ b/Controls.DocumentViewer/DocumentViewer.vb
@@ -69,8 +69,14 @@ Public Class DocumentViewer
    ''' Terminate Viewer, freeing up resources and deleting temp files
    ''' </summary>
    Public Sub Done()
+        _logger.Debug("Done: Deleting Temp Files")
        DeleteTempFiles()
+
+        _logger.Debug("Done: Closing Documents")
        FreeFile()
+
+        _logger.Debug("Done: Triggering GC")
+        GC.Collect()
    End Sub

    ''' <summary>
@@ -150,7 +156,7 @@ Public Class DocumentViewer

    Private Sub FreeFile()
        Try
-            If Len(_FilePath) OrElse _Fileinfo Is Nothing Then
+            If Len(_FilePath) = 0 OrElse _Fileinfo Is Nothing Then
                Exit Sub
            End If
            Dim oExtension As String = _Fileinfo.Extension.ToUpper
--- a/Controls.DocumentViewer/My
+++ b/Controls.DocumentViewer/My
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("1.6.2.0")>
-<Assembly: AssemblyFileVersion("1.6.2.0")>
+<Assembly: AssemblyVersion("1.6.3.0")>
+<Assembly: AssemblyFileVersion("1.6.3.0")>
--- a/GUIs.Test.EDMIBenchmark/Form1.vb
+++ b/GUIs.Test.EDMIBenchmark/Form1.vb
@@ -61,8 +61,8 @@ Public Class Form1

                AddLogMessage($"Importing {oFileInfo.Name}... ({FormatBytes(oFileInfo.Length)})")

-                Dim oObjectId As Long = Await _Client.ImportFileAsync(oFileInfo.FullName, "WichtigesDokument", 1, 0)
-                AddLogMessage($"File with Id [{oObjectId}] imported!")
+                'Dim oObjectId As Long = Await _Client.ImportFileAsync(oFileInfo.FullName, "WichtigesDokument", 1, 0)
+                'AddLogMessage($"File with Id [{oObjectId}] imported!")
                oCountFiles += 1
                oSW.Stop()
                AddLogMessage($"Import Time: {FormatTime(oSW.ElapsedMilliseconds)}")
--- a/Project/Application.Designer.vb
+++ b/Project/Application.Designer.vb
@@ -32,7 +32,7 @@ Namespace My
        
        <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
        Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.TestGUI.frmStart
+            Me.MainForm = Global.TestGUI.frmDocView
        End Sub
    End Class
 End Namespace
--- a/Project/Application.myapp
+++ b/Project/Application.myapp
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
  <MySubMain>true</MySubMain>
-  <MainForm>frmStart</MainForm>
+  <MainForm>frmDocView</MainForm>
  <SingleInstance>false</SingleInstance>
  <ShutdownMode>0</ShutdownMode>
  <EnableVisualStyles>true</EnableVisualStyles>
--- a/Project/licenses.licx
+++ b/Project/licenses.licx
@@ -1,6 +1,7 @@
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/GUIs.Test.TestGUI/TestGUI.vbproj
+++ b/GUIs.Test.TestGUI/TestGUI.vbproj
@@ -51,10 +51,30 @@
    <ApplicationManifest>My Project\app.manifest</ApplicationManifest>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.DataAccess.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Printing.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Spreadsheet.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Utils.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="GdPicture.NET.14, Version=14.1.0.97, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    </Reference>
    <Reference Include="Microsoft.CSharp" />
    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
@@ -125,6 +145,18 @@
    <Compile Include="frmConfigTest.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmDocView.Designer.vb">
+      <DependentUpon>frmDocView.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmDocView.vb">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="frmDocViewPure.Designer.vb">
+      <DependentUpon>frmDocViewPure.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmDocViewPure.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmFilesystem.Designer.vb">
      <DependentUpon>frmFilesystem.vb</DependentUpon>
    </Compile>
@@ -166,6 +198,7 @@
    <Compile Include="My Project\Application.Designer.vb">
      <AutoGen>True</AutoGen>
      <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
    </Compile>
    <Compile Include="My Project\Resources.Designer.vb">
      <AutoGen>True</AutoGen>
@@ -185,6 +218,12 @@
    <EmbeddedResource Include="frmConfigTest.resx">
      <DependentUpon>frmConfigTest.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmDocView.resx">
+      <DependentUpon>frmDocView.vb</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="frmDocViewPure.resx">
+      <DependentUpon>frmDocViewPure.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmFilesystem.resx">
      <DependentUpon>frmFilesystem.vb</DependentUpon>
    </EmbeddedResource>
@@ -229,6 +268,10 @@
    <WCFMetadata Include="Connected Services\" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\Controls.DocumentViewer\DocumentViewer.vbproj">
+      <Project>{0958cddf-4a16-41f6-8837-8335f71d599c}</Project>
+      <Name>DocumentViewer</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Controls.LookupGrid\LookupControl.vbproj">
      <Project>{3dcd6d1a-c830-4241-b7e4-27430e7ea483}</Project>
      <Name>LookupControl</Name>
--- a/GUIs.Test.TestGUI/frmDocView.Designer.vb
+++ b/GUIs.Test.TestGUI/frmDocView.Designer.vb
@@ -0,0 +1,104 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmDocView
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.Button2 = New System.Windows.Forms.Button()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.TextBox1 = New System.Windows.Forms.TextBox()
+        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
+        Me.Panel1.SuspendLayout()
+        Me.SuspendLayout()
+        '
+        'Panel1
+        '
+        Me.Panel1.Controls.Add(Me.Button2)
+        Me.Panel1.Controls.Add(Me.Button1)
+        Me.Panel1.Controls.Add(Me.TextBox1)
+        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.Panel1.Location = New System.Drawing.Point(0, 0)
+        Me.Panel1.Name = "Panel1"
+        Me.Panel1.Size = New System.Drawing.Size(1079, 43)
+        Me.Panel1.TabIndex = 1
+        '
+        'Button2
+        '
+        Me.Button2.Location = New System.Drawing.Point(992, 10)
+        Me.Button2.Name = "Button2"
+        Me.Button2.Size = New System.Drawing.Size(75, 23)
+        Me.Button2.TabIndex = 1
+        Me.Button2.Text = "Unload File"
+        Me.Button2.UseVisualStyleBackColor = True
+        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(864, 10)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 1
+        Me.Button1.Text = "Open File"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'TextBox1
+        '
+        Me.TextBox1.Location = New System.Drawing.Point(12, 12)
+        Me.TextBox1.Name = "TextBox1"
+        Me.TextBox1.Size = New System.Drawing.Size(846, 20)
+        Me.TextBox1.TabIndex = 0
+        '
+        'OpenFileDialog1
+        '
+        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
+        '
+        'DocumentViewer1
+        '
+        Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.DocumentViewer1.FileLoaded = False
+        Me.DocumentViewer1.Location = New System.Drawing.Point(0, 43)
+        Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Size = New System.Drawing.Size(1079, 463)
+        Me.DocumentViewer1.TabIndex = 0
+        '
+        'frmDocView
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(1079, 506)
+        Me.Controls.Add(Me.Panel1)
+        Me.Controls.Add(Me.DocumentViewer1)
+        Me.Name = "frmDocView"
+        Me.Text = "frmDocView"
+        Me.Panel1.ResumeLayout(False)
+        Me.Panel1.PerformLayout()
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
+    Friend WithEvents Panel1 As Panel
+    Friend WithEvents Button1 As Button
+    Friend WithEvents TextBox1 As TextBox
+    Friend WithEvents OpenFileDialog1 As OpenFileDialog
+    Friend WithEvents Button2 As Button
+End Class
--- a/GUIs.Test.TestGUI/frmDocView.resx
+++ b/GUIs.Test.TestGUI/frmDocView.resx
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <metadata name="OpenFileDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+</root>
--- a/GUIs.Test.TestGUI/frmDocView.vb
+++ b/GUIs.Test.TestGUI/frmDocView.vb
@@ -0,0 +1,20 @@
+Imports DigitalData.Modules.Logging
+
+Public Class frmDocView
+    Private LogConfig As LogConfig
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
+            DocumentViewer1.LoadFile(OpenFileDialog1.FileName)
+        End If
+    End Sub
+
+    Private Sub frmDocView_Load(sender As Object, e As EventArgs) Handles Me.Load
+        LogConfig = New LogConfig(LogConfig.PathType.Temp)
+        DocumentViewer1.Init(LogConfig, "21182889975216572111813147150675976632")
+    End Sub
+
+    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
+        DocumentViewer1.Done()
+    End Sub
+End Class
--- a/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb
+++ b/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb
@@ -0,0 +1,61 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmDocViewPure
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+        Try
+            If disposing AndAlso components IsNot Nothing Then
+                components.Dispose()
+            End If
+        Finally
+            MyBase.Dispose(disposing)
+        End Try
+    End Sub
+
+    'Wird vom Windows Form-Designer benötigt.
+    Private components As System.ComponentModel.IContainer
+
+    'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+    'Das Bearbeiten ist mit dem Windows Form-Designer möglich.  
+    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.SuspendLayout()
+        '
+        'SpreadsheetControl1
+        '
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(349, 187)
+        Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
+        Me.SpreadsheetControl1.Size = New System.Drawing.Size(400, 200)
+        Me.SpreadsheetControl1.TabIndex = 0
+        Me.SpreadsheetControl1.Text = "SpreadsheetControl1"
+        '
+        'Button1
+        '
+        Me.Button1.Location = New System.Drawing.Point(546, 25)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(75, 23)
+        Me.Button1.TabIndex = 1
+        Me.Button1.Text = "unload"
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'frmDocViewPure
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.Button1)
+        Me.Controls.Add(Me.SpreadsheetControl1)
+        Me.Name = "frmDocViewPure"
+        Me.Text = "frmDocViewPure"
+        Me.ResumeLayout(False)
+
+    End Sub
+
+    Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl
+    Friend WithEvents Button1 As Button
+End Class
--- a/GUIs.Test.TestGUI/frmDocViewPure.resx
+++ b/GUIs.Test.TestGUI/frmDocViewPure.resx
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>
--- a/GUIs.Test.TestGUI/frmDocViewPure.vb
+++ b/GUIs.Test.TestGUI/frmDocViewPure.vb
@@ -0,0 +1,16 @@
+Imports GdPicture14
+
+Public Class frmDocViewPure
+    Private Sub frmDocViewPure_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        SpreadsheetControl1.LoadDocument("E:\35MB.xlsx")
+
+    End Sub
+
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+        'SpreadsheetControl1.Document.Dispose()
+        'SpreadsheetControl1.Dispose()
+        'SpreadsheetControl1 = Nothing
+        SpreadsheetControl1.CreateNewDocument()
+        GC.Collect()
+    End Sub
+End Class
--- a/GUIs.Test.TestGUI/frmStart.Designer.vb
+++ b/GUIs.Test.TestGUI/frmStart.Designer.vb
@@ -27,6 +27,7 @@ Partial Class frmStart
        Me.Button3 = New System.Windows.Forms.Button()
        Me.Button4 = New System.Windows.Forms.Button()
        Me.Button5 = New System.Windows.Forms.Button()
+        Me.Button6 = New System.Windows.Forms.Button()
        Me.SuspendLayout()
        '
        'Button1
@@ -71,14 +72,24 @@ Partial Class frmStart
        Me.Button5.Name = "Button5"
        Me.Button5.Size = New System.Drawing.Size(236, 60)
        Me.Button5.TabIndex = 2
-        Me.Button5.Text = "Button5"
+        Me.Button5.Text = "Checksum"
        Me.Button5.UseVisualStyleBackColor = True
        '
+        'Button6
+        '
+        Me.Button6.Location = New System.Drawing.Point(12, 326)
+        Me.Button6.Name = "Button6"
+        Me.Button6.Size = New System.Drawing.Size(236, 60)
+        Me.Button6.TabIndex = 2
+        Me.Button6.Text = "DocView"
+        Me.Button6.UseVisualStyleBackColor = True
+        '
        'frmStart
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.Controls.Add(Me.Button6)
        Me.Controls.Add(Me.Button5)
        Me.Controls.Add(Me.Button4)
        Me.Controls.Add(Me.Button3)
@@ -95,4 +106,5 @@ Partial Class frmStart
    Friend WithEvents Button3 As Button
    Friend WithEvents Button4 As Button
    Friend WithEvents Button5 As Button
+    Friend WithEvents Button6 As Button
 End Class
--- a/GUIs.Test.TestGUI/frmStart.vb
+++ b/GUIs.Test.TestGUI/frmStart.vb
@@ -22,4 +22,8 @@ Public Class frmStart
    Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click
        frmChecksum.Show()
    End Sub
+
+    Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click
+        frmDocView.Show()
+    End Sub
 End Class
--- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb
+++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.Designer.vb
--- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx
+++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.resx
@@ -196,55 +196,6 @@
  <metadata name="GlobixDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
-  <data name="BtnDateinamenKonvention.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABwFAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
-        LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3
-        RDc7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7b3Bh
-        Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQoJLnN0M3tm
-        aWxsOiNGRkIxMTU7fQo8L3N0eWxlPg0KICA8ZyAvPg0KICA8ZyBpZD0iUmVuYW1lXzFfIj4NCiAgICA8
-        cGF0aCBkPSJNMi4xLDE2aDIuMmwwLjYtMi4zaDMuMkw4LjgsMTZIMTFMNy44LDZINS40TDIuMSwxNnog
-        TTYuNCw4LjdjMC4xLTAuMywwLjEtMC42LDAuMS0wLjloMC4xICAgYzAsMC4zLDAuMSwwLjYsMC4xLDAu
-        OWwxLDMuM0g1LjRMNi40LDguN3ogTTE3LjUsMTAuNmMwLjYtMC4yLDEuMS0wLjUsMS41LTAuOWMwLjQt
-        MC40LDAuNi0wLjksMC42LTEuNGMwLTAuNy0wLjMtMS4zLTAuOS0xLjcgICBDMTguMSw2LjIsMTcuMSw2
-        LDE1LjksNkgxMnY5LjlWMTZoNGMxLjIsMCwyLjItMC4yLDIuOS0wLjhDMTkuNywxNC42LDIwLDE0LDIw
-        LDEzYzAtMC42LTAuMi0xLjItMC43LTEuNiAgIEMxOC45LDExLDE4LjMsMTAuNywxNy41LDEwLjZ6IE0x
-        NC40LDcuN2gwLjljMS4xLDAsMS43LDAuNCwxLjcsMS4xYzAsMC40LTAuMSwwLjctMC40LDAuOUMxNi40
-        LDkuOSwxNiwxMCwxNS41LDEwaC0xLjFWNy43eiAgICBNMTcsMTMuOGMtMC4zLDAuMi0wLjgsMC40LTEu
-        MywwLjRoLTEuM3YtMi42aDEuM2MwLjUsMCwwLjksMC4xLDEuMywwLjNjMC4zLDAuMiwwLjUsMC42LDAu
-        NSwwLjlDMTcuNSwxMy4zLDE3LjQsMTMuNiwxNywxMy44eiIgY2xhc3M9IkJsYWNrIiAvPg0KICAgIDxw
-        YXRoIGQ9Ik0yNywxOWwtOCw4bC00LTRsOC04TDI3LDE5eiBNMjgsMThsMS43LTEuN2MwLjQtMC40LDAu
-        NC0xLDAtMS4zTDI3LDEyLjNjLTAuNC0wLjQtMS0wLjQtMS4zLDBMMjQsMTRMMjgsMTh6ICAgIE0xNCwy
-        NHY0aDRMMTQsMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="SimpleButton1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
-        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
-        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l
-        bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx
-        LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <metadata name="TBDD_INDEX_MANBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>821, 17</value>
-  </metadata>
  <data name="XtraTabPageManIndexe.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
@@ -302,26 +253,6 @@
        IC8+DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
  </data>
-  <data name="SimpleButton2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
-        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
-        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l
-        bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx
-        LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <metadata name="TBDD_INDEX_AUTOMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 56</value>
-  </metadata>
  <data name="XtraTabPageAutoIndexe.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
@@ -374,6 +305,55 @@
        LjEsMjguMSwyNy42LDI3LjZ6IiBjbGFzcz0iQmx1ZSIgLz4NCiAgPC9nPg0KPC9zdmc+Cw==
 </value>
  </data>
+  <metadata name="GlobixDataset.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
+  <data name="SimpleButton1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
+        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
+        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l
+        bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx
+        LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <metadata name="TBDD_INDEX_MANBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>821, 17</value>
+  </metadata>
+  <metadata name="TBDD_INDEX_MANBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>821, 17</value>
+  </metadata>
+  <data name="SimpleButton2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFMCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAxMyAxMyIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MTMgMTMiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
+        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
+        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQXBwb2ludG1l
+        bnRFbmRDb250aW51ZUFycm93XzFfIj4NCiAgICA8cG9seWdvbiBwb2ludHM9IjIsNyA3LDIgNyw1IDEx
+        LDUgMTEsOSA3LDkgNywxMiAgIiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <metadata name="TBDD_INDEX_AUTOMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
+  <metadata name="TBDD_INDEX_AUTOMBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 56</value>
+  </metadata>
  <metadata name="TBDD_DOKUMENTARTTableAdapter.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>399, 17</value>
  </metadata>
--- a/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb
+++ b/GUIs.ZooFlow/Globix/frmGlobixAdministration.vb
@@ -27,6 +27,16 @@ Public Class frmGlobixAdministration

    Private GroupToDelete As Integer = Nothing
    Dim frmloaded As Boolean = False
+
+    Public Class FileConflictOption
+        Public Name As String
+        Public Value As String
+
+        Public Overrides Function ToString() As String
+            Return Name
+        End Function
+    End Class
+
    Private Sub frmGlobixAdministration_Load(sender As Object, e As EventArgs) Handles Me.Load
        Try
            Me.TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = My.Database.CurrentSQLConnectionString
@@ -52,15 +62,11 @@ Public Class frmGlobixAdministration
        'oDragDropManager.AddGridView(viewAssignedUsers)
        'oDragDropManager.AddGridView(viewAvailableUsers)

-        Dim oDatatable As New DataTable()
-        oDatatable.Columns.Add("VALUE_TEXT")
-        oDatatable.Columns.Add("DISPLAY_TEXT")
-
-        oDatatable.Rows.Add("Default", "Datei Überschreiben")
-        oDatatable.Rows.Add("New version", "Neue Version erstellen")
-        oDatatable.Rows.Add("Question", "Nachfragen")
-
-        ComboBox3.DataSource = oDatatable
+        ComboBoxEdit1.Properties.Items.AddRange({
+            New FileConflictOption With {.Name = "Datei Überschreiben", .Value = "Default"},
+            New FileConflictOption With {.Name = "Neue Version erstellen", .Value = "New version"},
+            New FileConflictOption With {.Name = "Nachfragen", .Value = "Question"}
+        })

        Try

@@ -109,14 +115,10 @@ Public Class frmGlobixAdministration
        Throw New NotImplementedException()
    End Function

-    Private Sub BESCHREIBUNGTextBox_TextChanged(sender As Object, e As EventArgs) Handles BESCHREIBUNGTextBox.TextChanged
-
-    End Sub
-

    Private Sub Load_INDEXMAN(ProfileId As Integer)
        Try
-            Me.TBDD_INDEX_MANTableAdapter.Fill(Me.GlobixDataset.TBDD_INDEX_MAN, CType(DokartGUIDTextBox.Text, Integer))
+            Me.TBDD_INDEX_MANTableAdapter.Fill(Me.GlobixDataset.TBDD_INDEX_MAN, CType(ProfileGUID.Text, Integer))
            If GlobixDataset.TBDD_INDEX_MAN.Rows.Count > 0 Then
                EnableControls(XtraTabPageManIndexe)
            End If
@@ -145,7 +147,7 @@ Public Class frmGlobixAdministration
            Case XtraTabPageManIndexe.Name
                RibbonPageGroupManualIndex.Enabled = True

-                If DokartGUIDTextBox.Text <> "" Then
+                If ProfileGUID.Text <> "" Then
                    ' Load_INDEXMAN(Me.DokartGUIDTextBox.Text)
                End If
            Case XtraTabPageRework.Name
@@ -153,7 +155,7 @@ Public Class frmGlobixAdministration

                'Load_PostProcessing(Me.DOKART_GUIDTextBox.Text)
            Case XtraTabPageAutoIndexe.Name
-                Load_INDEXE_AUTO(CType(DokartGUIDTextBox.Text, Integer))
+                Load_INDEXE_AUTO(CType(ProfileGUID.Text, Integer))

                RibbonPageGroupAutoIndex.Enabled = True
                'Case XtraTabPageFolderPath.Name
@@ -173,7 +175,7 @@ Public Class frmGlobixAdministration

    Private Sub Load_INDEXE_AUTO(ProfileId As Integer)
        Try
-            Me.TBDD_INDEX_AUTOMTableAdapter.Fill(Me.GlobixDataset.TBDD_INDEX_AUTOM, CType(DokartGUIDTextBox.Text, Integer))
+            Me.TBDD_INDEX_AUTOMTableAdapter.Fill(Me.GlobixDataset.TBDD_INDEX_AUTOM, CType(ProfileGUID.Text, Integer))
            If GlobixDataset.TBDD_INDEX_AUTOM.Rows.Count > 0 Then
                EnableControls(XtraTabPageAutoIndexe)
            End If
@@ -192,7 +194,7 @@ Public Class frmGlobixAdministration
        Next
    End Sub

-    Private Sub Root_Click(sender As Object, e As EventArgs) Handles ControlGroupProfile.Click, ControlGroupIndexeMan.Click, ControlGroupIndexeAuto.Click
+    Private Sub Root_Click(sender As Object, e As EventArgs) Handles ControlGroupIndexeMan.Click, ControlGroupIndexeAuto.Click
        CURRCOntrolGroup = sender
        Select Case CURRCOntrolGroup.Name

@@ -208,4 +210,12 @@ Public Class frmGlobixAdministration
    Public Function DeleteData() As Boolean Implements IAdminForm.DeleteData
        Throw New NotImplementedException()
    End Function
+
+    Private Sub BtnDateinamenKonvention_Click(sender As Object, e As EventArgs)
+
+    End Sub
+
+    Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick
+
+    End Sub
 End Class
--- a/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
+++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
@@ -256,7 +256,7 @@ Partial Class frmGlobix_Index
        Me.pnlIndex.BackColor = System.Drawing.SystemColors.Control
        Me.pnlIndex.Dock = System.Windows.Forms.DockStyle.Fill
        Me.pnlIndex.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.pnlIndex.ForeColor = System.Drawing.Color.White
+        Me.pnlIndex.ForeColor = System.Drawing.SystemColors.ControlText
        Me.pnlIndex.Location = New System.Drawing.Point(0, 33)
        Me.pnlIndex.Name = "pnlIndex"
        Me.pnlIndex.Size = New System.Drawing.Size(591, 400)
--- a/GUIs.ZooFlow/Globix/frmGlobix_Index.vb
+++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.vb
@@ -358,9 +358,9 @@ Public Class frmGlobix_Index
            MsgBox(ex.Message, MsgBoxStyle.Critical, "Unexpected error in Refresh_IndexeMan:")
        End Try
    End Sub
-    Sub addLabel(indexname As String, hinweis As String, ylbl As Integer, anz As String)
+    Sub addLabel(pIndexName As String, hinweis As String, ylbl As Integer, anz As String)
        Dim lbl As New Label With {
-            .Name = "lbl" & indexname,
+            .Name = "lbl" & pIndexName,
            .AutoSize = True,
            .Text = hinweis,
            .Location = New Point(11, ylbl)
@@ -383,7 +383,7 @@ Public Class frmGlobix_Index
            Dim oControlCount As Integer = 1
            Dim oLabelPosition As Integer = 11 * oDpiScale
            Dim oControlPosition As Integer = 33 * oDpiScale
-            ' Dim oControls As New GlobixControls(_LogConfig, pnlIndex, Me)
+
            Dim oControls As New DigitalData.GUIs.GlobalIndexer.ControlCreator(_LogConfig, pnlIndex, Me) With {
                .OnControlChanged = AddressOf PrepareDependingControl,
                .OnLookupData = AddressOf GetLookupData
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -810,6 +810,16 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property editnames() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("editnames", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -118,9 +118,6 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="save5" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -139,17 +136,17 @@
  <data name="doublenext2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doublenext2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="ZooFlow_PM_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ZooFlow_PM_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="doublenext1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <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_deletecircled6" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="definednameuseinformula3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="editquery" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="Checked-outforEdit_Color_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -160,11 +157,14 @@
  <data name="definednameuseinformula" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\definednameuseinformula.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="DD_Icons_ICO_PMANAGER_128px" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="about1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="ZooFlow_PM_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ZooFlow_PM_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="bell_go" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -175,8 +175,14 @@
  <data name="about2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="renamedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <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="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="StatusAnnotations_Stop_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="actions_check4" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_check5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -187,9 +193,6 @@
  <data name="actions_window" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_window.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="ZOO_FLOW_ sysicon_256" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ZOO_FLOW_ sysicon_256.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -214,9 +217,6 @@
  <data name="actions_check3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="actions_check2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
  <data name="actions_addcircled3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -244,15 +244,12 @@
  <data name="save2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="doublenext" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="del1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\del1.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" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="CW_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="Checked-outforEdit_13297" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -262,17 +259,20 @@
  <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>
-  <data name="actions_check1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_check1.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_DROP3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\1_LOGO_ZOO_FLOW_DROP3.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_addcircled5" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_addcircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="highimportance" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="about1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="save3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\save3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="save7" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\save7.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -295,8 +295,11 @@
  <data name="DD_Icons_ICO_PMANAGER_256px" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="save4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="ZooFlow_CW_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ZooFlow_CW_DevExpress.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="ZooFlow-25" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -307,9 +310,6 @@
  <data name="actions_addcircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_addcircled2.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="actions_edit2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_edit2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -325,21 +325,24 @@
  <data name="about3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="doublenext" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="pagesetup" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="actions_add1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_add1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="3_PERSON_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="del3" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="bo_appearance" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="actions_deletecircled2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_deletecircled2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="4_GLOBIX_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="del4" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -349,8 +352,8 @@
  <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="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="save4" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="pagesetup1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pagesetup1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -367,29 +370,29 @@
  <data name="ZooFlow_G_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="definednameuseinformula3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_database.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_FLOW1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="StatusAnnotations_Stop_16xLG_color" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\StatusAnnotations_Stop_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <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="actions_deletecircled1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="editquery" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_check1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="3_PERSON_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="CW_klein" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="actions_edit1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
-  <data name="bo_appearance" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_check2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <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>
@@ -397,23 +400,23 @@
  <data name="crossdatasourcefiltering" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\crossdatasourcefiltering.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <data name="4_GLOBIX_AKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="actions_deletecircled6" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <data name="Flow" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="save3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\save3.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_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="3_PERSON_INAKTIV_ZOO" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3_PERSON_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="action_add_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="highimportance" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="renamedatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\renamedatasource.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>
@@ -430,13 +433,13 @@
  <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>
-  <data name="del" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="1_LOGO_ZOO_FLOW" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="GLOBIX_short" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="ZooFlow_CW_DevExpress" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ZooFlow_CW_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="editnames" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\editnames.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
 </root>
--- a/Project/licenses.licx
+++ b/Project/licenses.licx
@@ -1,20 +1,21 @@
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.TileControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetFormulaBar, DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.FormAssistant, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemDateEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.FormAssistant, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.PictureEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
--- a/GUIs.ZooFlow/Resources/editnames.svg
+++ b/GUIs.ZooFlow/Resources/editnames.svg
@@ -0,0 +1,20 @@
+<?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">
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.White{fill:#FFFFFF;}
+	.Green{fill:#039C23;}
+	.st0{opacity:0.75;}
+	.st1{opacity:0.5;}
+	.st2{opacity:0.25;}
+	.st3{fill:#FFB115;}
+</style>
+  <g />
+  <g id="Rename_1_">
+    <path d="M2.1,16h2.2l0.6-2.3h3.2L8.8,16H11L7.8,6H5.4L2.1,16z M6.4,8.7c0.1-0.3,0.1-0.6,0.1-0.9h0.1   c0,0.3,0.1,0.6,0.1,0.9l1,3.3H5.4L6.4,8.7z M17.5,10.6c0.6-0.2,1.1-0.5,1.5-0.9c0.4-0.4,0.6-0.9,0.6-1.4c0-0.7-0.3-1.3-0.9-1.7   C18.1,6.2,17.1,6,15.9,6H12v9.9V16h4c1.2,0,2.2-0.2,2.9-0.8C19.7,14.6,20,14,20,13c0-0.6-0.2-1.2-0.7-1.6   C18.9,11,18.3,10.7,17.5,10.6z M14.4,7.7h0.9c1.1,0,1.7,0.4,1.7,1.1c0,0.4-0.1,0.7-0.4,0.9C16.4,9.9,16,10,15.5,10h-1.1V7.7z    M17,13.8c-0.3,0.2-0.8,0.4-1.3,0.4h-1.3v-2.6h1.3c0.5,0,0.9,0.1,1.3,0.3c0.3,0.2,0.5,0.6,0.5,0.9C17.5,13.3,17.4,13.6,17,13.8z" class="Black" />
+    <path d="M27,19l-8,8l-4-4l8-8L27,19z M28,18l1.7-1.7c0.4-0.4,0.4-1,0-1.3L27,12.3c-0.4-0.4-1-0.4-1.3,0L24,14L28,18z    M14,24v4h4L14,24z" class="Blue" />
+  </g>
+</svg>
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -66,16 +66,26 @@
  <ItemGroup>
    <Reference Include="Accessibility" />
    <Reference Include="DevExpress.BonusSkins.v19.2" />
+    <Reference Include="DevExpress.Charts.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Data.v19.2" />
    <Reference Include="DevExpress.DataAccess.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.DataAccess.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Office.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Printing.v19.2.Core" />
+    <Reference Include="DevExpress.RichEdit.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.Spreadsheet.v19.2.Core, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.Utils.v19.2" />
+    <Reference Include="DevExpress.Utils.v19.2.UI, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraBars.v19.2" />
    <Reference Include="DevExpress.Sparkline.v19.2.Core" />
+    <Reference Include="DevExpress.XtraCharts.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraEditors.v19.2" />
    <Reference Include="DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraNavBar.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraPrinting.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="DevExpress.XtraTreeList.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
    <Reference Include="Independentsoft.Msg">
      <HintPath>P:\Visual Studio Projekte\Bibliotheken\MSG .NET\Bin\22_11_19\Independentsoft.Msg.dll</HintPath>
@@ -185,10 +195,10 @@
    <Compile Include="DSIDB_Stammdaten.vb">
      <DependentUpon>DSIDB_Stammdaten.xsd</DependentUpon>
    </Compile>
-    <Compile Include="frmtest.Designer.vb">
-      <DependentUpon>frmtest.vb</DependentUpon>
+    <Compile Include="frmTest.Designer.vb">
+      <DependentUpon>frmTest.vb</DependentUpon>
    </Compile>
-    <Compile Include="frmtest.vb">
+    <Compile Include="frmTest.vb">
      <SubType>Form</SubType>
    </Compile>
    <Compile Include="Globix\ClassExclusions.vb" />
@@ -199,6 +209,7 @@
    <Compile Include="Globix\frmGlobixAdministration.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="modCurrent.vb" />
    <Compile Include="MyDataset.Designer.vb">
      <AutoGen>True</AutoGen>
      <DesignTime>True</DesignTime>
@@ -223,7 +234,6 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>GlobixDataset.xsd</DependentUpon>
    </Compile>
-    <Compile Include="modCurrent.vb" />
    <Compile Include="MyDataset.vb">
      <DependentUpon>MyDataset.xsd</DependentUpon>
    </Compile>
@@ -344,8 +354,8 @@
    <EmbeddedResource Include="Administration\frmAdmin_SourceSQL.resx">
      <DependentUpon>frmAdmin_SourceSQL.vb</DependentUpon>
    </EmbeddedResource>
-    <EmbeddedResource Include="frmtest.resx">
-      <DependentUpon>frmtest.vb</DependentUpon>
+    <EmbeddedResource Include="frmTest.resx">
+      <DependentUpon>frmTest.vb</DependentUpon>
    </EmbeddedResource>
    <EmbeddedResource Include="Globix\frmGlobixAdministration.resx">
      <DependentUpon>frmGlobixAdministration.vb</DependentUpon>
@@ -859,6 +869,9 @@
  <ItemGroup>
    <None Include="Resources\ZooFlow_CW_DevExpress.svg" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\editnames.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/GUIs.ZooFlow/frmFlowForm.Designer.vb
+++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb
@@ -49,6 +49,7 @@ Partial Class frmFlowForm
        Me.PictureBoxPM1 = New DevExpress.XtraEditors.SvgImageBox()
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
        Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox()
+        Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
        Me.ContextMenuSystray.SuspendLayout()
        CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -72,16 +73,16 @@ Partial Class frmFlowForm
        '
        'ContextMenuSystray
        '
-        Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobixToolStripMenuItem, Me.UserKonfigurationToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ZooFlowBeendenToolStripMenuItem, Me.TestToolStripMenuItem})
+        Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobixToolStripMenuItem, Me.UserKonfigurationToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem})
        Me.ContextMenuSystray.Name = "ContextMenuSystray"
-        Me.ContextMenuSystray.Size = New System.Drawing.Size(174, 120)
+        Me.ContextMenuSystray.Size = New System.Drawing.Size(181, 148)
        '
        'GlobixToolStripMenuItem
        '
        Me.GlobixToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsiGlobixConfig})
        Me.GlobixToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.GLOBIX_short
        Me.GlobixToolStripMenuItem.Name = "GlobixToolStripMenuItem"
-        Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.GlobixToolStripMenuItem.Text = "Globix"
        Me.GlobixToolStripMenuItem.Visible = False
        '
@@ -95,7 +96,7 @@ Partial Class frmFlowForm
        '
        Me.UserKonfigurationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DatenbankverbindungToolStripMenuItem})
        Me.UserKonfigurationToolStripMenuItem.Name = "UserKonfigurationToolStripMenuItem"
-        Me.UserKonfigurationToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.UserKonfigurationToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.UserKonfigurationToolStripMenuItem.Text = "User Konfiguration"
        '
        'DatenbankverbindungToolStripMenuItem
@@ -107,31 +108,31 @@ Partial Class frmFlowForm
        'ToolStripSeparator1
        '
        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(170, 6)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6)
        '
        'VerwaltungToolStripMenuItem
        '
        Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem"
-        Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.VerwaltungToolStripMenuItem.Text = "Verwaltung"
        '
        'ZooFlowBeendenToolStripMenuItem
        '
        Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem"
-        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
        '
        'TestToolStripMenuItem
        '
        Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
-        Me.TestToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.TestToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
        Me.TestToolStripMenuItem.Text = "Test"
        '
        'PictureBoxAbo
        '
        Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand
        Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo
-        Me.PictureBoxAbo.Location = New System.Drawing.Point(209, 75)
+        Me.PictureBoxAbo.Location = New System.Drawing.Point(275, 0)
        Me.PictureBoxAbo.Name = "PictureBoxAbo"
        Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36)
        Me.PictureBoxAbo.TabIndex = 11
@@ -201,7 +202,7 @@ Partial Class frmFlowForm
        '
        Me.PictureBox1.BackColor = System.Drawing.Color.Transparent
        Me.PictureBox1.Image = CType(resources.GetObject("PictureBox1.Image"), System.Drawing.Image)
-        Me.PictureBox1.Location = New System.Drawing.Point(209, 47)
+        Me.PictureBox1.Location = New System.Drawing.Point(203, 6)
        Me.PictureBox1.Name = "PictureBox1"
        Me.PictureBox1.Size = New System.Drawing.Size(40, 22)
        Me.PictureBox1.TabIndex = 12
@@ -221,6 +222,11 @@ Partial Class frmFlowForm
        Me.PictureBoxSearch1.TabIndex = 13
        Me.PictureBoxSearch1.Text = "SvgImageBox1"
        '
+        'ToolStripSeparator2
+        '
+        Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(177, 6)
+        '
        'frmFlowForm
        '
        Me.AllowDrop = True
@@ -277,4 +283,5 @@ Partial Class frmFlowForm
    Friend WithEvents PictureBoxSearch1 As DevExpress.XtraEditors.SvgImageBox
    Friend WithEvents PictureBoxPM1 As DevExpress.XtraEditors.SvgImageBox
    Friend WithEvents PictureBoxGlobix1 As DevExpress.XtraEditors.SvgImageBox
+    Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
 End Class
--- a/GUIs.ZooFlow/frmtest.Designer.vb
+++ b/GUIs.ZooFlow/frmtest.Designer.vb
@@ -39,6 +39,7 @@ Partial Class frmtest
        Me.Button6 = New System.Windows.Forms.Button()
        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
        Me.Button7 = New System.Windows.Forms.Button()
+        Me.Button8 = New System.Windows.Forms.Button()
        Me.SuspendLayout()
        '
        'txtFilestoreType
@@ -183,11 +184,21 @@ Partial Class frmtest
        Me.Button7.Text = "4C. Alternative"
        Me.Button7.UseVisualStyleBackColor = True
        '
+        'Button8
+        '
+        Me.Button8.Location = New System.Drawing.Point(666, 14)
+        Me.Button8.Name = "Button8"
+        Me.Button8.Size = New System.Drawing.Size(187, 23)
+        Me.Button8.TabIndex = 17
+        Me.Button8.Text = "1B. All-In-One"
+        Me.Button8.UseVisualStyleBackColor = True
+        '
        'frmtest
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(800, 450)
+        Me.ClientSize = New System.Drawing.Size(865, 450)
+        Me.Controls.Add(Me.Button8)
        Me.Controls.Add(Me.Button6)
        Me.Controls.Add(Me.CheckBoxKeepExtension)
        Me.Controls.Add(Me.Button7)
@@ -227,4 +238,5 @@ Partial Class frmtest
    Friend WithEvents Button6 As Button
    Friend WithEvents OpenFileDialog1 As OpenFileDialog
    Friend WithEvents Button7 As Button
+    Friend WithEvents Button8 As Button
 End Class
--- a/GUIs.ZooFlow/frmtest.vb
+++ b/GUIs.ZooFlow/frmtest.vb
@@ -93,4 +93,36 @@ Public Class frmtest

        File.Copy(txtIDBFOPath.Text, oFile)
    End Sub
+
+    Private Async Sub Button8_Click(sender As Object, e As EventArgs) Handles Button8.Click
+        Dim oResult As Object
+
+        If OpenFileDialog1.ShowDialog() <> DialogResult.OK Then
+            Exit Sub
+        End If
+
+        txtFile2Import.Text = OpenFileDialog1.FileName
+
+        Using oStream As New FileStream(txtFile2Import.Text, FileMode.Open, FileAccess.Read)
+            Using oMemoryStream As New MemoryStream
+                oStream.CopyTo(oMemoryStream)
+                Dim oContents As Byte() = oMemoryStream.ToArray()
+
+                oResult = Await My.Application.Service.Client.ImportFileAsync(
+                    txtFile2Import.Text,
+                    Environment.UserName,
+                    Date.Now,
+                    "WORK",
+                    1,
+                    "DEFAULT",
+                    New Client.ImportFileOptions With {
+                        .KeepExtension = True
+                    }
+                )
+
+                MsgBox($"File saved to: [{oResult}]")
+                'oResult = Await My.Application.Service.Client.ImportFileObjectAsync(oContents, My.Application.User.UserName, txtIDB_OBJ_ID.Text, 1, txtIDBFOPath.Text)
+            End Using
+        End Using
+    End Sub
 End Class
--- a/Modules.Logging/LogConfig.vb
+++ b/Modules.Logging/LogConfig.vb
@@ -324,10 +324,15 @@ Public Class LogConfig
    End Function

    ''' <summary>
-    ''' Returns the Logger for the specified module
+    ''' Returns the Logger for the specified module using event-properties
    ''' </summary>
+    ''' <remarks>
+    ''' https://github.com/NLog/NLog/wiki/EventProperties-Layout-Renderer
+    ''' https://stackoverflow.com/questions/31337030/separate-log-file-for-specific-class-instance-using-nlog/32065824#32065824
+    ''' </remarks>
    ''' <returns>An object of Logging.Logger</returns>
-    Public Function GetLoggerWithModule(ModuleName As String) As Logger
+    <DebuggerStepThrough()>
+    Public Function GetLoggerFor(ModuleName As String) As Logger
        Dim oClassName As String = GetClassFullName()
        Return GetLogger(oClassName, ModuleName)
    End Function
@@ -340,7 +345,11 @@ Public Class LogConfig
    <DebuggerStepThrough()>
    Public Function GetLogger(ClassName As String, ModuleName As String) As Logger
        Dim oLogger = LogFactory.GetLogger(Of Logger)(ClassName)
-        oLogger.ModuleName = ModuleName
+
+        If ModuleName IsNot Nothing Then
+            Return oLogger.WithProperty("ModuleName", $"-{ModuleName}")
+        End If
+
        Return oLogger
    End Function

@@ -431,7 +440,6 @@ Public Class LogConfig
    Private Sub AddDefaultRules(ByRef config As LoggingConfiguration)
        config.AddRuleForOneLevel(LogLevel.Error, TARGET_ERROR_EX)
        config.AddRuleForOneLevel(LogLevel.Fatal, TARGET_ERROR_EX)
-        config.AddRuleForOneLevel(LogLevel.Warn, TARGET_ERROR)
        config.AddRuleForOneLevel(LogLevel.Warn, TARGET_DEFAULT)
        config.AddRuleForOneLevel(LogLevel.Info, TARGET_DEFAULT)
    End Sub
--- a/Modules.Logging/Logger.vb
+++ b/Modules.Logging/Logger.vb
@@ -2,70 +2,7 @@

 Public Class Logger
    Inherits NLog.Logger
-    Implements ILogger

-    ''' <summary>
-    ''' Optional ModuleName to create different LogFiles for different Modules (arbitrary entities, User, File, etc.)
-    ''' </summary>
-    ''' <returns>The current ModuleName of the logger, if any.</returns>
-    Public Property ModuleName As String = Nothing
-
-    <DebuggerStepThrough>
-    Public Overloads Sub Info(Message As String)
-        LogWithModuleName(Message, LogLevel.Info)
-    End Sub
-
-    <DebuggerStepThrough>
-    Public Overloads Sub Warn(Message As String)
-        LogWithModuleName(Message, LogLevel.Warn)
-    End Sub
-
-    <DebuggerStepThrough>
-    Public Overloads Sub [Error](Exception As Exception)
-        LogWithModuleName(Exception)
-    End Sub
-
-    <DebuggerStepThrough>
-    Public Overloads Sub Debug(Message As String)
-        LogWithModuleName(Message, LogLevel.Debug)
-    End Sub
-
-    <DebuggerStepThrough>
-    Public Overloads Sub Trace(Message As String)
-        LogWithModuleName(Message, LogLevel.Trace)
-    End Sub
-
-    Private Sub LogWithModuleName(Exception As Exception)
-        Dim oEventInfo As New LogEventInfo() With {
-            .Exception = Exception,
-            .Level = LogLevel.Error,
-            .LoggerName = Name,
-            .Message = Exception.Message
-        }
-        oEventInfo = MaybeSetModuleName(oEventInfo)
-
-        Log(oEventInfo)
-    End Sub
-
-    Private Sub LogWithModuleName(Message As String, LogLevel As LogLevel)
-        Dim oEventInfo As New LogEventInfo(LogLevel, Name, Message)
-        oEventInfo = MaybeSetModuleName(oEventInfo)
-
-        Log(oEventInfo)
-    End Sub
-
-    Private Function MaybeSetModuleName(LogEventInfo As LogEventInfo) As LogEventInfo
-        If ModuleName IsNot Nothing AndAlso ModuleName <> String.Empty Then
-            LogEventInfo.Properties.Item("ModuleName") = ModuleName
-        End If
-
-        Return LogEventInfo
-    End Function
-
-    ''' <summary>
-    ''' Prints a preformatted Block including a block identifier
-    ''' </summary>
-    ''' <param name="blockId">A unique Identifier for this block, eg. DocId, FullPath, ..</param>
    <DebuggerStepThrough()>
    Public Sub NewBlock(blockId As String)
        Dim message As String = $"-----> Start of Block {blockId}"
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>

-<Assembly: AssemblyVersion("2.3.1.0")>
-<Assembly: AssemblyFileVersion("2.3.1.0")>
+<Assembly: AssemblyVersion("2.4.0.0")>
+<Assembly: AssemblyFileVersion("2.4.0.0")>
--- a/Service.EDMIService/EDMIService.vb
+++ b/Service.EDMIService/EDMIService.vb
@@ -106,8 +106,7 @@ Public Class EDMIService
                Return New TableResult(oFilteredTable)
            Else
                _Logger.Warn($"ReturnDatatableFromCache: Datatable {Name} does not exist")
-                Dim oDetails As New DataTableDoesNotExistFault(Name)
-                Throw New FaultException(Of DataTableDoesNotExistFault)(oDetails)
+                Throw GetFault($"ReturnDatatableFromCache: Datatable {Name} does not exist")
            End If

        Catch ex As FaultException
@@ -116,8 +115,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -137,8 +135,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -155,8 +152,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -173,8 +169,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -194,8 +189,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -212,8 +206,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -230,8 +223,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -251,8 +243,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -269,8 +260,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -287,8 +277,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -345,8 +334,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -390,8 +378,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -417,10 +404,9 @@ Public Class EDMIService
            Throw ex

        Catch ex As Exception
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            _Logger.Warn("GetFileInfoByObjectId: " & oDetails.ErrorMessage)
+            _Logger.Warn("GetFileInfoByObjectId: " & ex.Message)
            _Logger.Error(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -439,8 +425,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -528,8 +513,7 @@ Public Class EDMIService
            Dim oObjectId = MSSQL_IDB.GetScalarValue(oSQL)

            If oObjectId Is Nothing Then
-                Dim oDetails As New UnexpectedErrorFault(New Exception("NewObjectId: Could not create new ObjectId!"))
-                Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+                Throw GetFault("NewObjectId: Could not create new ObjectId!")
            End If

            Return New NewObjectIdResponse With {.ObjectId = oObjectId}
@@ -539,37 +523,50 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function

    Public Function NewFileObject(Data As NewFileObjectRequest) As NewFileObjectResponse Implements IEDMIService.NewFileObject
        Try
-            Dim oRelpath As String
            Dim oStoreType As String = Data.StoreType

+            _Logger.Debug("DataStore type is [{0}]", oStoreType)
+
            If oStoreType = String.Empty Then
+                _Logger.Debug("DataStore empty, set to [{0}]", ClassConstants.FileStoreWork)
                oStoreType = ClassConstants.FileStoreWork
            End If

-            oRelpath = GetFileStorePraefix(oStoreType)
+            Dim oRelpath As String = GetFileStorePraefix(oStoreType)
+            Dim oSubDirectory As String

            If IsNothing(Data.DateImported) Then
-                oRelpath = GetFolderToday(oRelpath)
+                oSubDirectory = GetDateSubDirectory(Now)
            Else
+                oSubDirectory = GetDateSubDirectory(Data.DateImported)
+            End If
+
+            _Logger.Debug("Subdirectory is [{0}]", oSubDirectory)
+
+            oRelpath = Path.Combine(oRelpath, oSubDirectory)
+
+            If Not Directory.Exists(oRelpath) Then
                Try
-                    Dim oDate = CDate(Data.DateImported)
-                    oRelpath = GetFolderDate(oRelpath, oDate)
+                    _Logger.Debug("Path does not exist, creating: [{0}]", oRelpath)
+                    Directory.CreateDirectory(oRelpath)
+                    _Logger.Debug("Created folder [{0}]", oRelpath)
                Catch ex As Exception
-                    Dim oDetails As New UnexpectedErrorFault(ex)
-                    Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+                    Throw GetFault(ex)
                End Try
            End If

-            _Logger.Debug($"oRelpath is [{oRelpath}]")
+            _Logger.Debug("Relative Path is [{0}]", oRelpath)
+
            Dim oFileObjectPath As String = Path.Combine(oRelpath, GetFileObjectFileName(Data.ObjectId, Data.Extension, Data.KeepExtension))
+            _Logger.Debug("Final Path is [{0}]", oFileObjectPath)
+
            Return New NewFileObjectResponse With {.FileObjectPath = oFileObjectPath}
        Catch ex As FaultException
            _Logger.Error(ex)
@@ -577,8 +574,7 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
@@ -609,63 +605,49 @@ Public Class EDMIService

        Catch ex As Exception
            _Logger.Error(ex)
-            Dim oDetails As New UnexpectedErrorFault(ex)
-            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+            Throw GetFault(ex)

        End Try
    End Function
 #End Region

    Private Function GetFileObjectFileName(IDB_OBJ_ID As Long, pExtension As String, pKeepExtension As Boolean) As String
+        If Not pExtension.StartsWith("."c) Then
+            pExtension &= "."c
+        End If
+
        If pKeepExtension Then
-            Return $"{IDB_OBJ_ID}.{pExtension}"
+            Return $"{IDB_OBJ_ID}{pExtension}"
        Else
            Return $"{IDB_OBJ_ID}.ddfo"
        End If
    End Function
+
    Private Function GetFileStorePraefix(pStoreType As String) As String
        Dim oObjectStore
+
        If pStoreType = ClassConstants.FileStoreArchive Then
            oObjectStore = GlobalState.ObjectStores.Item(0)
        Else ' pStoreType = ClassConstants.FileStoreWork Then
            oObjectStore = GlobalState.ObjectStores.Item(1)
        End If
+
        _Logger.Debug($"oObjectStore is [{oObjectStore.Path}]")
        Return oObjectStore.Path
    End Function
-    Private Function GetFolderToday(pRelationalPath As String) As String
-        Dim oDateSubDirectoryName As String = GetDateSubDirectory(Now)
-        Dim oFolderToday As String = Path.Combine(pRelationalPath, oDateSubDirectoryName)
-        ' Create the destination directory if it does not exist
-        If Not Directory.Exists(oFolderToday) Then
-            Try
-                Directory.CreateDirectory(oFolderToday)
-                _Logger.Debug($"Created NEW todayFolder [{oFolderToday}]")
-            Catch ex As Exception
-                _Logger.Error(ex)
-                Return ""
-            End Try
-        End If
-        Return oFolderToday
-    End Function
-    Private Function GetFolderDate(pRelationalPath As String, pDate As Date) As String
-        Dim oDateSubDirectoryName As String = GetDateSubDirectory(pDate)
-        Dim oFolderDateSepecial As String = Path.Combine(pRelationalPath, oDateSubDirectoryName)
-        ' Create the destination directory if it does not exist
-        If Not Directory.Exists(oFolderDateSepecial) Then
-            Try
-                Directory.CreateDirectory(oFolderDateSepecial)
-                _Logger.Debug($"Created NEW DateSpecialFolder [{oFolderDateSepecial}]")
-            Catch ex As Exception
-                _Logger.Error(ex)
-                Return ""
-            End Try
-        End If
-        Return oFolderDateSepecial
-    End Function
-    Private Function GetDateSubDirectory([Date] As Date) As String
-        Return [Date].ToString("yyyy-MM-dd")
+
+    Private Function GetDateSubDirectory(pDate As Date) As String
+        Return Path.Combine(pDate.ToString("yyyy"), pDate.ToString("MM"), pDate.ToString("dd"))
    End Function

+    Private Function GetFault(Exception As Exception) As FaultException
+        Dim oFault As New UnexpectedErrorFault(Exception)
+        Return New FaultException(Of UnexpectedErrorFault)(oFault, New FaultReason(oFault.InnerException.Message))
+    End Function
+
+    Private Function GetFault(ErrorMessage As String) As FaultException
+        Dim oFault As New UnexpectedErrorFault(New ApplicationException(ErrorMessage))
+        Return New FaultException(Of UnexpectedErrorFault)(oFault, New FaultReason(oFault.InnerException.Message))
+    End Function

 End Class
--- a/Service.EDMIService/Helpers/Exceptions.vb
+++ b/Service.EDMIService/Helpers/Exceptions.vb
@@ -12,10 +12,6 @@ Namespace Exceptions
        End Sub
    End Class

-
-
-
-
    <DataContract>
    Public Class BaseFault
        ''' <summary>
--- a/Service.EDMIService/Scheduler/Scheduler.vb
+++ b/Service.EDMIService/Scheduler/Scheduler.vb
@@ -22,7 +22,8 @@ Public Class Scheduler

    Public Sub New(LogConfig As LogConfig, MSSQL_ECM As MSSQLServer, TableStore As DataSet)
        _LogConfig = LogConfig
-        _Logger = LogConfig.GetLogger()
+        _Logger = LogConfig.GetLoggerFor("Scheduler")
+
        _Factory = New StdSchedulerFactory(_Props)
        _MSSQL = MSSQL_ECM
        _JobListener = New JobListener(LogConfig, _MSSQL, TableStore)
Author	SHA1	Message	Date
Jonathan Jenne	c558df75a9	ZooFlow: Update Zooflow Form, Globix Tweaks	2021-06-17 13:12:12 +02:00
Jonathan Jenne	2529c30726	EDMIService: Small tweaks for AppServer	2021-06-17 13:11:39 +02:00
Jonathan Jenne	54e93d0f73	Logging: Version 2.4.0	2021-06-17 13:10:58 +02:00
Jonathan Jenne	85a33b35e8	Logging: Remove Warning from Error Log, Add Sublogging with Modules, Revert own Logger methods	2021-06-17 13:05:29 +02:00
Jonathan Jenne	4b7315a5e1	GUIs.Test: Update Test Apps	2021-06-17 13:03:10 +02:00
Jonathan Jenne	af84806bf5	DocumentViewer: Version 1.6.3	2021-06-17 12:58:42 +02:00
Jonathan Jenne	350ee79274	DocumentViewer: Trigger GC on done	2021-06-17 12:58:04 +02:00
Jonathan Jenne	8328fb27dc	GUIs.Test: Update test apps	2021-06-16 14:51:47 +02:00