ZooFlow: Include new icons

EDMI.API: Clean up Client
EDMIService: clean up edmiservice
2021-06-14 14:46:47 +02:00 · 2021-06-14 14:46:32 +02:00 · 2021-06-14 14:46:15 +02:00
25 changed files with 856 additions and 449 deletions
--- a/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
+++ b/GUIs.ZooFlow/Globix/frmGlobix_Index.Designer.vb
@@ -23,11 +23,11 @@ Partial Class frmGlobix_Index
    <System.Diagnostics.DebuggerStepThrough()> _
    Private Sub InitializeComponent()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmGlobix_Index))
-        Dim EditorButtonImageOptions1 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions()
-        Dim SerializableAppearanceObject1 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
-        Dim SerializableAppearanceObject2 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
-        Dim SerializableAppearanceObject3 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
-        Dim SerializableAppearanceObject4 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
+        Dim EditorButtonImageOptions2 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions()
+        Dim SerializableAppearanceObject5 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
+        Dim SerializableAppearanceObject6 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
+        Dim SerializableAppearanceObject7 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
+        Dim SerializableAppearanceObject8 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject()
        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
@@ -52,19 +52,19 @@ Partial Class frmGlobix_Index
        Me.BarCheckItem2 = New DevExpress.XtraBars.BarCheckItem()
        Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
        Me.pnlIndex = New System.Windows.Forms.Panel()
-        Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit()
        Me.Panel3 = New System.Windows.Forms.Panel()
        Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit()
        Me.Panel1 = New System.Windows.Forms.Panel()
+        Me.ComboBoxEdit1 = New DevExpress.XtraEditors.ComboBoxEdit()
        Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
        Me.GlobixDataset = New DigitalData.GUIs.ZooFlow.GlobixDataset()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerControl1.SuspendLayout()
-        CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel3.SuspendLayout()
        CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.Panel1.SuspendLayout()
+        CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GlobixDataset, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
@@ -268,21 +268,6 @@ Partial Class frmGlobix_Index
        Me.pnlIndex.Size = New System.Drawing.Size(591, 400)
        Me.pnlIndex.TabIndex = 3
        '
-        'ComboBoxEdit1
-        '
-        Me.ComboBoxEdit1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.ComboBoxEdit1.Location = New System.Drawing.Point(0, 0)
-        Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1
-        Me.ComboBoxEdit1.Name = "ComboBoxEdit1"
-        SerializableAppearanceObject1.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer))
-        SerializableAppearanceObject1.Options.UseBackColor = True
-        Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo, "", 20, True, True, False, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default])})
-        Me.ComboBoxEdit1.Properties.ButtonsStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat
-        Me.ComboBoxEdit1.Properties.NullText = "Bitte wählen Sie ein Profil"
-        Me.ComboBoxEdit1.Properties.Padding = New System.Windows.Forms.Padding(5)
-        Me.ComboBoxEdit1.Size = New System.Drawing.Size(591, 30)
-        Me.ComboBoxEdit1.TabIndex = 4
-        '
        'Panel3
        '
        Me.Panel3.Controls.Add(Me.PictureEdit1)
@@ -299,7 +284,7 @@ Partial Class frmGlobix_Index
        Me.PictureEdit1.Location = New System.Drawing.Point(0, 0)
        Me.PictureEdit1.MenuManager = Me.RibbonControl1
        Me.PictureEdit1.Name = "PictureEdit1"
-        Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.Silver
+        Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.SystemColors.Control
        Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True
        Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Flat
        Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
@@ -317,6 +302,21 @@ Partial Class frmGlobix_Index
        Me.Panel1.Size = New System.Drawing.Size(591, 33)
        Me.Panel1.TabIndex = 0
        '
+        'ComboBoxEdit1
+        '
+        Me.ComboBoxEdit1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.ComboBoxEdit1.Location = New System.Drawing.Point(0, 0)
+        Me.ComboBoxEdit1.MenuManager = Me.RibbonControl1
+        Me.ComboBoxEdit1.Name = "ComboBoxEdit1"
+        SerializableAppearanceObject5.BackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(214, Byte), Integer), CType(CType(49, Byte), Integer))
+        SerializableAppearanceObject5.Options.UseBackColor = True
+        Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo, "", 20, True, True, False, EditorButtonImageOptions2, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject5, SerializableAppearanceObject6, SerializableAppearanceObject7, SerializableAppearanceObject8, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default])})
+        Me.ComboBoxEdit1.Properties.ButtonsStyle = DevExpress.XtraEditors.Controls.BorderStyles.UltraFlat
+        Me.ComboBoxEdit1.Properties.NullText = "Bitte wählen Sie ein Profil"
+        Me.ComboBoxEdit1.Properties.Padding = New System.Windows.Forms.Padding(5)
+        Me.ComboBoxEdit1.Size = New System.Drawing.Size(591, 30)
+        Me.ComboBoxEdit1.TabIndex = 4
+        '
        'DocumentViewer1
        '
        Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill
@@ -339,18 +339,20 @@ Partial Class frmGlobix_Index
        Me.Controls.Add(Me.SplitContainerControl1)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.RibbonControl1)
+        Me.IconOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_G_DevExpress
+        Me.IconOptions.SvgImageColorizationMode = DevExpress.Utils.SvgImageColorizationMode.Full
        Me.Name = "frmGlobix_Index"
        Me.Ribbon = Me.RibbonControl1
        Me.StatusBar = Me.RibbonStatusBar1
-        Me.Text = "frmGlobix_Index"
+        Me.Text = "ZooFlow - Ablage"
        Me.TopMost = True
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerControl1.ResumeLayout(False)
-        CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel3.ResumeLayout(False)
        CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        Me.Panel1.ResumeLayout(False)
+        CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GlobixDataset, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()
--- a/Project/Resources.Designer.vb
+++ b/Project/Resources.Designer.vb
@@ -1090,6 +1090,36 @@ Namespace My.Resources
            End Get
        End Property
        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property ZooFlow_CW_DevExpress() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ZooFlow_CW_DevExpress", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property ZooFlow_G_DevExpress() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ZooFlow_G_DevExpress", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property ZooFlow_PM_DevExpress() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("ZooFlow_PM_DevExpress", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
        '''<summary>
        '''  Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
        '''</summary>
--- a/Project/Resources.resx
+++ b/Project/Resources.resx
@@ -139,14 +139,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="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_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="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>
@@ -157,11 +160,8 @@
  <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="actions_options" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_options.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <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>
@@ -169,17 +169,17 @@
  <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>
  </data>
+  <data name="bo_attention" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_attention.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
  <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="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 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="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="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 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>
  </data>
  <data name="editdatasource1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -187,6 +187,9 @@
  <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>
@@ -211,6 +214,9 @@
  <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>
@@ -229,8 +235,8 @@
  <data name="save1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</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="actions_options" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_options.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="bell_delete" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -238,12 +244,15 @@
  <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>
@@ -253,21 +262,18 @@
  <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>
-  <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>
  </data>
@@ -289,8 +295,8 @@
  <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="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 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="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>
@@ -301,6 +307,9 @@
  <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>
@@ -316,24 +325,21 @@
  <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="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 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="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>
@@ -343,8 +349,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="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="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="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>
@@ -358,29 +364,32 @@
  <data name="actions_deletecircled4" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\actions_deletecircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
+  <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>
  <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="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 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_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="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 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="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 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="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="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 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_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>
@@ -391,20 +400,20 @@
  <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="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 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_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="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="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>
+  <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="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="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="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>
@@ -421,13 +430,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="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 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="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="bo_attention" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\bo_attention.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>
 </root>
--- a/GUIs.ZooFlow/Resources/ZooFlow_CW_DevExpress.svg
+++ b/GUIs.ZooFlow/Resources/ZooFlow_CW_DevExpress.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 64 64"
+   style="enable-background:new 0 0 64 64;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ZooFlow_CW_DevExpress.svg"><metadata
+   id="metadata5299"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs5297" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1519"
+   inkscape:window-height="699"
+   id="namedview5295"
+   showgrid="false"
+   inkscape:zoom="3.6875"
+   inkscape:cx="-5.1525424"
+   inkscape:cy="32"
+   inkscape:window-x="0"
+   inkscape:window-y="0"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="g5285" />
+<style
+   type="text/css"
+   id="style5283">
+	.st0{clip-path:url(#SVGID_2_);fill:#A62432;}
+</style>
+<g
+   id="g5285">
+	<defs
+   id="defs5287">
+		<rect
+   id="SVGID_1_"
+   width="64"
+   height="64" />
+	</defs>
+	<clipPath
+   id="SVGID_2_">
+		<use
+   xlink:href="#SVGID_1_"
+   style="overflow:visible;"
+   id="use5291" />
+	</clipPath>
+	<path
+   class="st0"
+   d="M38.22,38.22c2.93-2.93,3.34-7.4,1.28-10.78c-0.11,0.35-0.28,0.68-0.56,0.96c-0.94,0.94-2.46,0.94-3.39,0   c-0.94-0.94-0.94-2.46,0-3.39c0.27-0.27,0.59-0.44,0.92-0.55c-3.38-2-7.79-1.58-10.69,1.32c-3.44,3.44-3.44,9.01,0,12.44   C29.21,41.66,34.79,41.66,38.22,38.22 M54.4,32c0,0-10.03,14.4-22.4,14.4S9.6,32,9.6,32S19.63,17.6,32,17.6S54.4,32,54.4,32 M64,32   C64,14.33,49.67,0,32,0S0,14.33,0,32s14.33,32,32,32S64,49.67,64,32"
+   id="path5293"
+   clip-path="url(#SVGID_2_)"
+   style="fill:#d04d2f;fill-opacity:1" />
+</g>
+</svg>
--- a/GUIs.ZooFlow/Resources/ZooFlow_G_DevExpress.svg
+++ b/GUIs.ZooFlow/Resources/ZooFlow_G_DevExpress.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 64 64"
+   style="enable-background:new 0 0 64 64;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ZooFlow_G_DevExpress.svg"><metadata
+   id="metadata4153"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs4151" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1017"
+   id="namedview4149"
+   showgrid="false"
+   inkscape:zoom="12.6875"
+   inkscape:cx="19.1133"
+   inkscape:cy="32"
+   inkscape:window-x="-8"
+   inkscape:window-y="-8"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="g4139" />
+<style
+   type="text/css"
+   id="style4137">
+	.st0{clip-path:url(#SVGID_2_);fill:#A62432;}
+</style>
+<g
+   id="g4139">
+	<defs
+   id="defs4141">
+		<rect
+   id="SVGID_1_"
+   width="64"
+   height="64" />
+	</defs>
+	<clipPath
+   id="SVGID_2_">
+		<use
+   xlink:href="#SVGID_1_"
+   style="overflow:visible;"
+   id="use4145" />
+	</clipPath>
+	<path
+   class="st0"
+   d="M54.84,32L42.36,44.48v-6.79L48.06,32l-5.69-5.69v-6.79L54.84,32z M42.23,32.07l-10.3,10.3l-10.3-10.3   l3.39-3.39l6.9,6.9l6.9-6.9L42.23,32.07z M21.64,26.31L15.94,32l5.69,5.69v6.79L9.16,32l12.48-12.48V26.31z M64,32   C64,14.33,49.67,0,32,0S0,14.33,0,32s14.33,32,32,32S64,49.67,64,32"
+   id="path4147"
+   clip-path="url(#SVGID_2_)"
+   style="fill:#d04d2f;fill-opacity:1" />
+</g>
+</svg>
--- a/GUIs.ZooFlow/Resources/ZooFlow_PM_DevExpress.svg
+++ b/GUIs.ZooFlow/Resources/ZooFlow_PM_DevExpress.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 25.2.3, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Ebene_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 64 64"
+   style="enable-background:new 0 0 64 64;"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="ZooFlow_PM_DevExpress.svg"><metadata
+   id="metadata4181"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs4179" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1397"
+   inkscape:window-height="805"
+   id="namedview4177"
+   showgrid="false"
+   inkscape:zoom="3.6875"
+   inkscape:cx="-5.1525424"
+   inkscape:cy="32"
+   inkscape:window-x="127"
+   inkscape:window-y="14"
+   inkscape:window-maximized="0"
+   inkscape:current-layer="g4167" />
+<style
+   type="text/css"
+   id="style4165">
+	.st0{clip-path:url(#SVGID_2_);fill:#A62432;}
+</style>
+<g
+   id="g4167">
+	<defs
+   id="defs4169">
+		<rect
+   id="SVGID_1_"
+   width="64"
+   height="64" />
+	</defs>
+	<clipPath
+   id="SVGID_2_">
+		<use
+   xlink:href="#SVGID_1_"
+   style="overflow:visible;"
+   id="use4173" />
+	</clipPath>
+	<path
+   class="st0"
+   d="M29.54,35.71l-5.16-2.98l-5.16,2.98v5.96l5.16,2.98l5.16-2.98V35.71z M32,31.28l5.16-2.98v-5.96L32,19.36   l-5.16,2.98v5.96L32,31.28z M39.62,44.64l5.16-2.98v-5.96l-5.16-2.98l-5.16,2.98v5.96L39.62,44.64z M49.58,44.44l-9.96,5.75   L32,45.79l-7.62,4.4l-9.96-5.75v-11.5l7.62-4.4v-8.97L32,13.82l9.96,5.75v8.97l7.62,4.4V44.44z M64,32C64,14.33,49.67,0,32,0   S0,14.33,0,32s14.33,32,32,32S64,49.67,64,32"
+   id="path4175"
+   clip-path="url(#SVGID_2_)"
+   style="fill:#d04d2f;fill-opacity:1" />
+</g>
+</svg>
--- a/GUIs.ZooFlow/Resources/ZooFlow_g-64.png
+++ b/GUIs.ZooFlow/Resources/ZooFlow_g-64.png
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -850,6 +850,15 @@
      <Install>false</Install>
    </BootstrapperPackage>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ZooFlow_G_DevExpress.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ZooFlow_PM_DevExpress.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\ZooFlow_CW_DevExpress.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
@@ -36,27 +36,27 @@ Partial Class frmFlowForm
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
        Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components)
        Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components)
        Me.PictureBoxAbo = New System.Windows.Forms.PictureBox()
        Me.PictureBoxDragDrop = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxPM = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxSearch = New System.Windows.Forms.PictureBox()
        Me.TimerCheckActiveForms = New System.Windows.Forms.Timer(Me.components)
        Me.TimerCheckDroppedFiles = New System.Windows.Forms.Timer(Me.components)
        Me.TimerFolderwatch = New System.Windows.Forms.Timer(Me.components)
        Me.ToastNotificationsManager1 = New DevExpress.XtraBars.ToastNotifications.ToastNotificationsManager(Me.components)
+        Me.PictureBoxGlobix1 = New DevExpress.XtraEditors.SvgImageBox()
+        Me.PictureBoxPM1 = New DevExpress.XtraEditors.SvgImageBox()
        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxGlobix = New System.Windows.Forms.PictureBox()
-        Me.TestToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.PictureBoxSearch1 = New DevExpress.XtraEditors.SvgImageBox()
        Me.ContextMenuSystray.SuspendLayout()
        CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'SplashScreenManager
@@ -74,14 +74,14 @@ Partial Class frmFlowForm
        '
        Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobixToolStripMenuItem, Me.UserKonfigurationToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ZooFlowBeendenToolStripMenuItem, Me.TestToolStripMenuItem})
        Me.ContextMenuSystray.Name = "ContextMenuSystray"
-        Me.ContextMenuSystray.Size = New System.Drawing.Size(181, 142)
+        Me.ContextMenuSystray.Size = New System.Drawing.Size(174, 120)
        '
        '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(180, 22)
+        Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
        Me.GlobixToolStripMenuItem.Text = "Globix"
        Me.GlobixToolStripMenuItem.Visible = False
        '
@@ -95,7 +95,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(180, 22)
+        Me.UserKonfigurationToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
        Me.UserKonfigurationToolStripMenuItem.Text = "User Konfiguration"
        '
        'DatenbankverbindungToolStripMenuItem
@@ -107,20 +107,26 @@ Partial Class frmFlowForm
        'ToolStripSeparator1
        '
        Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(177, 6)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(170, 6)
        '
        'VerwaltungToolStripMenuItem
        '
        Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem"
-        Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
        Me.VerwaltungToolStripMenuItem.Text = "Verwaltung"
        '
        'ZooFlowBeendenToolStripMenuItem
        '
        Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem"
-        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
+        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
        Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
        '
+        'TestToolStripMenuItem
+        '
+        Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
+        Me.TestToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.TestToolStripMenuItem.Text = "Test"
+        '
        'PictureBoxAbo
        '
        Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand
@@ -144,32 +150,6 @@ Partial Class frmFlowForm
        Me.PictureBoxDragDrop.TabStop = False
        Me.ToolTip1.SetToolTip(Me.PictureBoxDragDrop, "Drag and Drop files here")
        '
-        'PictureBoxPM
-        '
-        Me.PictureBoxPM.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxPM.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.PictureBoxPM.Image = CType(resources.GetObject("PictureBoxPM.Image"), System.Drawing.Image)
-        Me.PictureBoxPM.Location = New System.Drawing.Point(335, 23)
-        Me.PictureBoxPM.Name = "PictureBoxPM"
-        Me.PictureBoxPM.Size = New System.Drawing.Size(90, 101)
-        Me.PictureBoxPM.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBoxPM.TabIndex = 4
-        Me.PictureBoxPM.TabStop = False
-        Me.ToolTip1.SetToolTip(Me.PictureBoxPM, "ProcessManager starten")
-        '
-        'PictureBoxSearch
-        '
-        Me.PictureBoxSearch.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxSearch.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.PictureBoxSearch.Image = CType(resources.GetObject("PictureBoxSearch.Image"), System.Drawing.Image)
-        Me.PictureBoxSearch.Location = New System.Drawing.Point(220, 23)
-        Me.PictureBoxSearch.Name = "PictureBoxSearch"
-        Me.PictureBoxSearch.Size = New System.Drawing.Size(90, 101)
-        Me.PictureBoxSearch.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBoxSearch.TabIndex = 3
-        Me.PictureBoxSearch.TabStop = False
-        Me.ToolTip1.SetToolTip(Me.PictureBoxSearch, "ZooFlow Suche")
-        '
        'TimerCheckActiveForms
        '
        Me.TimerCheckActiveForms.Interval = 2000
@@ -189,6 +169,34 @@ Partial Class frmFlowForm
                    "empor incididunt ut labore et dolore magna aliqua.", "Body2 - Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod " &
                    "tempor incididunt ut labore et dolore magna aliqua.", DevExpress.XtraBars.ToastNotifications.ToastNotificationSound.Looping_Alarm4, DevExpress.XtraBars.ToastNotifications.ToastNotificationDuration.[Default], DevExpress.XtraBars.ToastNotifications.ToastNotificationTemplate.Text01)})
        '
+        'PictureBoxGlobix1
+        '
+        Me.PictureBoxGlobix1.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.PictureBoxGlobix1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.PictureBoxGlobix1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark
+        Me.PictureBoxGlobix1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox
+        Me.PictureBoxGlobix1.Location = New System.Drawing.Point(448, 34)
+        Me.PictureBoxGlobix1.Name = "PictureBoxGlobix1"
+        Me.PictureBoxGlobix1.Size = New System.Drawing.Size(90, 90)
+        Me.PictureBoxGlobix1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom
+        Me.PictureBoxGlobix1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_G_DevExpress
+        Me.PictureBoxGlobix1.TabIndex = 15
+        Me.PictureBoxGlobix1.Text = "SvgImageBox1"
+        '
+        'PictureBoxPM1
+        '
+        Me.PictureBoxPM1.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.PictureBoxPM1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.PictureBoxPM1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark
+        Me.PictureBoxPM1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox
+        Me.PictureBoxPM1.Location = New System.Drawing.Point(336, 34)
+        Me.PictureBoxPM1.Name = "PictureBoxPM1"
+        Me.PictureBoxPM1.Size = New System.Drawing.Size(90, 90)
+        Me.PictureBoxPM1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom
+        Me.PictureBoxPM1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_PM_DevExpress
+        Me.PictureBoxPM1.TabIndex = 14
+        Me.PictureBoxPM1.Text = "SvgImageBox1"
+        '
        'PictureBox1
        '
        Me.PictureBox1.BackColor = System.Drawing.Color.Transparent
@@ -199,23 +207,19 @@ Partial Class frmFlowForm
        Me.PictureBox1.TabIndex = 12
        Me.PictureBox1.TabStop = False
        '
-        'PictureBoxGlobix
+        'PictureBoxSearch1
        '
-        Me.PictureBoxGlobix.BackColor = System.Drawing.Color.Transparent
-        Me.PictureBoxGlobix.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.PictureBoxGlobix.Image = CType(resources.GetObject("PictureBoxGlobix.Image"), System.Drawing.Image)
-        Me.PictureBoxGlobix.Location = New System.Drawing.Point(448, 23)
-        Me.PictureBoxGlobix.Name = "PictureBoxGlobix"
-        Me.PictureBoxGlobix.Size = New System.Drawing.Size(90, 101)
-        Me.PictureBoxGlobix.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
-        Me.PictureBoxGlobix.TabIndex = 9
-        Me.PictureBoxGlobix.TabStop = False
-        '
-        'TestToolStripMenuItem
-        '
-        Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
-        Me.TestToolStripMenuItem.Size = New System.Drawing.Size(180, 22)
-        Me.TestToolStripMenuItem.Text = "Test"
+        Me.PictureBoxSearch1.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.PictureBoxSearch1.ItemAppearance.Hovered.FillColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(49, Byte), Integer))
+        Me.PictureBoxSearch1.ItemAppearance.Normal.FillColor = System.Drawing.SystemColors.ControlDark
+        Me.PictureBoxSearch1.ItemHitTestType = DevExpress.XtraEditors.ItemHitTestType.BoundingBox
+        Me.PictureBoxSearch1.Location = New System.Drawing.Point(225, 34)
+        Me.PictureBoxSearch1.Name = "PictureBoxSearch1"
+        Me.PictureBoxSearch1.Size = New System.Drawing.Size(90, 90)
+        Me.PictureBoxSearch1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Stretch
+        Me.PictureBoxSearch1.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZooFlow_CW_DevExpress
+        Me.PictureBoxSearch1.TabIndex = 13
+        Me.PictureBoxSearch1.Text = "SvgImageBox1"
        '
        'frmFlowForm
        '
@@ -228,12 +232,12 @@ Partial Class frmFlowForm
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(563, 150)
+        Me.Controls.Add(Me.PictureBoxGlobix1)
+        Me.Controls.Add(Me.PictureBoxPM1)
        Me.Controls.Add(Me.PictureBox1)
        Me.Controls.Add(Me.PictureBoxAbo)
+        Me.Controls.Add(Me.PictureBoxSearch1)
        Me.Controls.Add(Me.PictureBoxDragDrop)
-        Me.Controls.Add(Me.PictureBoxGlobix)
-        Me.Controls.Add(Me.PictureBoxPM)
-        Me.Controls.Add(Me.PictureBoxSearch)
        Me.DoubleBuffered = True
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None
        Me.IconOptions.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.ZOO_FLOW__sysicon_256
@@ -243,17 +247,14 @@ Partial Class frmFlowForm
        Me.ContextMenuSystray.ResumeLayout(False)
        CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBoxPM, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBoxSearch, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBoxGlobix1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBoxPM1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBoxSearch1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
-    Friend WithEvents PictureBoxSearch As PictureBox
-    Friend WithEvents PictureBoxPM As PictureBox
-    Friend WithEvents PictureBoxGlobix As PictureBox
    Friend WithEvents NotifyIcon As NotifyIcon
    Friend WithEvents ContextMenuSystray As ContextMenuStrip
    Friend WithEvents VerwaltungToolStripMenuItem As ToolStripMenuItem
@@ -273,4 +274,7 @@ Partial Class frmFlowForm
    Friend WithEvents TsiGlobixConfig As ToolStripMenuItem
    Friend WithEvents ToastNotificationsManager1 As DevExpress.XtraBars.ToastNotifications.ToastNotificationsManager
    Friend WithEvents TestToolStripMenuItem As ToolStripMenuItem
+    Friend WithEvents PictureBoxSearch1 As DevExpress.XtraEditors.SvgImageBox
+    Friend WithEvents PictureBoxPM1 As DevExpress.XtraEditors.SvgImageBox
+    Friend WithEvents PictureBoxGlobix1 As DevExpress.XtraEditors.SvgImageBox
 End Class
--- a/GUIs.ZooFlow/frmFlowForm.resx
+++ b/GUIs.ZooFlow/frmFlowForm.resx
@@ -1962,59 +1962,6 @@
  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>610, 17</value>
  </metadata>
-  <data name="PictureBoxPM.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAGsAAABQCAYAAAAeAotiAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EgAACxIB0t1+/AAABNBJREFUeF7tnV9qFEEQxnOEHCFP/gkxxhvkCB4hR8gNzBFyhBwhTyIisvggIiJB
-        RBBBgiK+CEYEEUHG+jbprU5bszszXbPb1VsPP0LNdk+mvo/unqmZnd1omsYxgrjRKRMOPj3YJ46cTuzH
-        Ii4LDi4PonE6cRSLuCw4cLP64GYZws0yRJFmTQhsX2egQapLkWat5KCKoiBdOHCzZNys8nj/8MYmcZ84
-        IibEOdHMAZ+jHdqj36a0X004WEOzSOAt4pA4IyRD+oL9YH9b0v/LhYM1MovE3CdOCUlwLbB/1UoHB2tg
-        Fom3R2DqksQdC/y/Pel4+sJBxWaRWFiPjq/EWxX4/1nrGgeVmkUCYcpbdLKwLHAcg6dGDio0i4TBYi+J
-        tmoOpeNdBAeVmUWCnCQClcaJdNzz4KAisyBEIkyp9DKMg0rMggCJIKXT2TAOKjCLEl/1Gd9QjqV8Ujgw
-        bhYlfJAIYI0DKa8YDgybRYmibHQRJZ7Nh0c3m6/Ptpufr3ab32d3m+bdvelfxNiOz6V+GeD455apOLBt
-        lmpV4stku/n7dm9qUBv4HO2k/hlMpPwCHBg1ixJUnf6+v9gRzWkD7aX9ZNA6HXJg0CxKDGUktekP01ts
-        BEbPt+c7zeent6ef4y/idNShX7qvDJCPWJbiwKZZuJckJdwbrEGxCVif2tYlbA/rGEA/5TVM1J0DY2ZR
-        QqqjCiOmj/ipuegvtRuIOLo4sGeW6loVj5Su01o8baK/1CaD/9YuDuyZpXV3d0oQHXSd0tAu7ie1yeAs
-        zZkDQ2ZRIriukhIczFDRh/bryLXrLhbBllnqtz6Gij60X0eu3UphEWyZpf78xJ83fLLQ9WIX7UIf9Jfa
-        ZHIa580i2DJL7Sww8OPlnZnwv17vim1S0C70QX+pTSYXcd4sghGzKAH19QqcP7k1E76L+LG5AP2ldgrM
-        1i0Wwo5ZeKZCSiqbtNSEkZOagDgeUWCEklPM7JkNFsKOWWpVixScisfXWwFc/MKg+CI4MK/SocTMAxbC
-        zZoC4dMprg20G9ko4GYtAkVb3LuSTML2UNxdAqbNWvqte6xTMGfEk4h5uFmGMG3WUqbBgnCzDOFmLQKl
-        JFw/pddUiLF9hOcv2jBt1mgXxQAmxHXCeaDdEkwzfVE8Srmpz/VVysjXW3bLTYASUC3kQmipcgETMHI+
-        Pr40An8RS6aOVMmwXcgFlITqLZJUfKxLwaA28Hm6nmE/UtsMqrhFonbzESMlR/DUaOU1rIqbj2rrVnwy
-        gZEitVlEPMKUb0Lav60PKJHsB2biUYWK+qKprw30iyvySqOrjgdmACWT/ShaPIXlrjea+7qiqkfRsh/y
-        jKfA3Co6+od9KUyFdT3kCSihrGpGEBdIn/dFcX+i7hzYNCtrdOHEICB93hel/YmjCnBg0CxAiVn/xmNK
-        nV/5CVCCy37Fz1jU/WU6QEmqf011BeD46/+aKqBE/QvgcePSoYT91QqWoMT9pSWWgACJIKWy3q8DCkCI
-        RJjS8BdtxZAg/go7S5Aw/nJIS5BA/tpVa5BY/kJja5B4/qpwa5CYKFPhJMRfwm8JEhjrmv+8hWkK0oUD
-        N0vGkFn+Y2eGfuzMkXGzDOFmGcLNMsTKzfKfa++OamWiK+JGp0zEjU6JNBv/APe0vJIO+s6vAAAAAElF
-        TkSuQmCC
-</value>
-  </data>
-  <data name="PictureBoxSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAGsAAABQCAYAAAAeAotiAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EgAACxIB0t1+/AAABLJJREFUeF7tnX9q1EAUx3uEHsG/rLa11hv0CD2CR+gN3CP0CD2Cf4mIyCJSREQW
-        EUEEKYoIUlARRASJ77syebPpS3aSzCbzJu+Pzx8vO5vmfb+dH5mZZLeKojCUIB400oSDj/eOiJkRxJEv
-        4lBw8P8iCiOImS/iUHBgZrXBzFKEmaWIJM2aEzg+ZaBBVZckzRrlopIiIV04MLNkzKz0ePfg+jZxTMyI
-        OXFBFA3gc5Q7Je4S16TzxoSDCZpFAsOgEwKiS4a0ZUHgfBsxjoMJmQUxiTNCEjwW+AeIOtPBwQTMIvGG
-        MKlKNNM4yNwsEgx9kSTmUNwntqVrC4WDTM0igQ4J9CWSgEPznTiWrjMEDjI0i4TBKA0CScKNyal0vevg
-        IDOzSJCxm711nEnX3QQHGZkFISrCpAqa5+B+jINMzKLktRjlmEt5SHCQgVmUOPooSZDUCWoSOVBuFiV8
-        VBFAGydSXj4cKDaLEsW0UYqjvrYcSvk5ONBtFm44peS1sZDyc3Cg1CxKUHvzV6VWcw70mrVuKSOIz/Pd
-        4tvz/eLXq4MVLs/3i4vHN8TvbAg05+KsPQcKzaKkeo/+vjzdLf68pq7i7Z1GYNyApomjQw50mtW5Vr1/
-        uFP8fHkgGtPE12d74vk2wJWbZQ6UmUXJYFVXSjKI34vbKyb8fXNY/Hhxa9kcfnpycwmMQY3yywE0jdI5
-        I3NFew70mdV5BIi+yRcfNQw1TSoLYFzVXJgqlY3IRTVnDhSZRYngvkpKcC0Q3hcdtUkqVwVm+oahn2sy
-        OBIr910sgi6zOjeBfj+FJk4qU8eHRzvL5tJ9H4MTqVxEVpZSWARdZnWarEVNcEID1DKpXBPor9z325rd
-        gZWbZBZBl1mdVn79JhDNmFRmHahd7hxAKhOZclTIIugyS0pqLX6tCO2rJPymcIB7r3KzDYugxCxcfCWZ
-        YHyz+gy//eF8l6a0JeVsPAsxMbMU1azSAxZCj1md91Yo7bPKqScWYgJmKRwNgnLZn4WYgFlA2X0WmK5Z
-        flMIEp/BANM1C7SdG8Qgojo3OODs+7TNqtYSIM26o5mrW0ZB+cvzvWUfBjY4KlQ9wIiyjA/D6ozoCmqs
-        9Ld6UnrAQkzMLEeblWJX26TPHX3u32rQe1MMhIR6E7oHAzVSMsknsmF6p5sAJTDaIzzV0WQdEQ1TP5E7
-        2n72kJrliGBYFkskvfZf9AUmSOZI9DQsi8XHzsv6MZCG/k2g35POEwCNfDhvFkGRWYASGXXLdFvDUF46
-        TwN5bJgBlMyoTSFoYxgGJtI5GriiPQfKzAKUUJSt030INayDWfls8gSUUBIPz4UY1rIZzG/7NKDERq9d
-        oMmwlgOMPB9MAJRYMo/8wDDMgrg1L5jXYedureYcKDULUIL2MN3ymFc4VShJe0x1ecwrnDKUaDLNYUem
-        8QC4gxK2VytoAolXhEidab60xEEC2OuANEEi9N6rsWGCmj4fDjIzC5Ag9go7TZAw9nJIbZBIYzeL9trV
-        NpBY9kJjbZB49qpwbZCY9hJ+jZDAMM5+3kI1CenCgZklo8gs+7EzRT92ZsiYWYowsxRhZilidLPs59rD
-        iTozEYp40EgT8aCRIsXWP0j108YYpYdeAAAAAElFTkSuQmCC
-</value>
-  </data>
  <metadata name="TimerCheckActiveForms.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>709, 17</value>
  </metadata>
@@ -2034,28 +1981,6 @@
        ktERREAQRElHLjIQhAgcYrgs1PkWjp+Txuh3hdpadu+c8vHU1HRPzy4SM7vE55G3wxGpKEQnpgVqemjR
        AAy1sABoaSyALRjf4iGyBWp6aEUsgKNiYsDX6KF1sQDui4mtvkYPbbo14PIVXgLTGsJWoP76EiuxDocI
        fkZ/uBc//0j+cCPc8B1uwFOcGgY3YBSnhsENKAUhnGRnDLEF/I8lMzpgJH6ZZgx9AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="PictureBoxGlobix.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAFAAAABQCAYAAACOEfKtAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
-        EgAACxIB0t1+/AAAA8pJREFUeF7t3D1uFEEQhmEfwUdwBAIhZG7gI/goPoKP4CP4FAQEyCIgRIgAiQRZ
-        IiAhcERAstQnjaX26t3dmu7qnlm5giepWXf9aH9me2Z9stlsUgMMJj8MJj8MJj8MJj8MJj8MJj8MJj8M
-        Jj8MJj8MjvTj/Ytzc2VuzZ3ZHKDH6LH6m3NacyQM9maNX05DeDA0pDm0hta6pFy9YbAHa/DUXJt7Q4OI
-        oLWV45Rq6AGD0aamIp5tXsp1TbVEw2AUa+LC9HzGHaLcF1RbFAy2sqL1cr2ZmlgD1dLlZY3BFlbomfk6
-        Fb4mqumMam6BwVpWoE5JRr7XzaXaQk99MFhDhU0FUuFrEjpEDM6lgqbCqOA1ChsiBuewQvSed0zDe6Sa
-        m98TMehlBejTdo0fGF6qvenTGYNelnxNpyq1bqg3Lwx6WGKdJFNBx6j6ZBuDHpa06hvGn89vuvr18RXm
-        PeCeevTA4CGWUN9tqZCDNt/fdaUhUl6Hqu/OGNzHEumDo/pTl5qO1DBA9TT7AwWD+1iS6mefbDe7z79v
-        dqpWPN5Df0d5nWY/CzG4jyVp2l0pm6Xjpb9f3j55vEfjAGe/F2JwF0ugnWRK7FY2S8dLCwxQZu1sY3AX
-        W1xb55TUrWyWjpcWGuAt9b4LBnexxZu/spXN0vHSQgN8oN53wSCxhbVhQAlnKZul46WFBijujQYMEltU
-        lxEp2Sxls3S8tOAAr2gGBIPEFm1+/5OyWTpeWnCA7vdBDBJb1HPR+6CyWTpeWnCAdzQDgkECSaqUzdLx
-        0u9Pr5883iNogNYyz2EbBgklqVE2S8draGg5wAarH6AtqA0ETDTXsQzQuDYWMLhNi20tXu1ZDlAgQZVj
-        GeB2/7tgkFCSGjnARs95gMNPpL06DLDLifTwr3JeHQbY5avc8M0Erw4D7LKZMHw7y6vDAOO3s8QWHrqh
-        6hU8wD4bqmKLD93S9woeYNct/aEXlbyCB9jvopJYgmGXNb0CB9j3sqZYkrAL63S8RuAAh1xYD7u1g47X
-        CBrgmFs7xBKF3FykLfsI5S0gDQMcc3PRI0tY9V5YDrCHygGOvb1NLGnVDZbUdKTKAY6/wVIs8exbfHUD
-        ZE8/P7zEvHssc4uvWPK8yZyCc1gB+TOHVlZI/tCmlQqaCqOC1yRseILBWipsKpAKX4PQ4QkGW1iB+XPX
-        VlaoPp3zB9etrOj8yX8EayL/6UQra0gvaw2y5zNSaytHl5crwWBv1mD+450o1rhOffJfPz1XGEx+GEx+
-        GEx+GEx+GEx+GEx+GEx+GEx+GExem5P/BhegvGcbWY4AAAAASUVORK5CYII=
 </value>
  </data>
 </root>
--- a/GUIs.ZooFlow/frmFlowForm.vb
+++ b/GUIs.ZooFlow/frmFlowForm.vb
@@ -206,12 +206,12 @@ Public Class frmFlowForm

        Dim oSQL = My.Queries.Common.FNIDB_GET_SEARCH_PROFILES(My.Application.User.UserId, My.Application.User.Language)
        Dim oDatatable As DataTable = My.DatabaseIDB.GetDatatable(oSQL)
-        PictureBoxSearch.Visible = False
+        PictureBoxSearch1.Visible = False

        If Not IsNothing(oDatatable) OrElse oDatatable.Rows.Count > 0 Then
            IDBSearchActive = True
            DTIDB_SEARCHES = oDatatable
-            PictureBoxSearch.Visible = True
+            PictureBoxSearch1.Visible = True
        End If

        If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then
@@ -430,7 +430,7 @@ Public Class frmFlowForm
        Cursor = Cursors.Default
    End Sub

-    Private Sub PictureBoxSearch_Click(sender As Object, e As EventArgs) Handles PictureBoxSearch.Click
+    Private Sub PictureBoxSearch1_Click(sender As Object, e As EventArgs) Handles PictureBoxSearch1.Click
        Open_FlowSearch()
        'Cursor = Cursors.WaitCursor
        'If TheFormIsAlreadyLoaded("frmSearchStart") Then
@@ -446,25 +446,7 @@ Public Class frmFlowForm
        '    TimerCheckActiveForms.Enabled = True
        'End If
    End Sub
-    Private Sub PictureBoxSearch_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseEnter
-        PictureBoxSearch.Image = My.Resources._2_LUPE_AKTIV_ZOO
-    End Sub
-    Private Sub PictureBoxSearch_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseLeave
-        PictureBoxSearch.Image = My.Resources._2_LUPE_INAKTIV_ZOO
-    End Sub
-    Private Sub PictureBoxPM_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxPM.MouseEnter
-        PictureBoxPM.Image = My.Resources._3_PERSON_AKTIV_ZOO
-    End Sub
-    Private Sub PictureBoxPM_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxPM.MouseLeave
-        PictureBoxPM.Image = My.Resources._3_PERSON_INAKTIV_ZOO
-    End Sub

-    Private Sub PictureBoxGlobix_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxGlobix.MouseEnter
-        PictureBoxGlobix.Image = My.Resources._4_GLOBIX_AKTIV_ZOO
-    End Sub
-    Private Sub PictureBoxGlobix_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxGlobix.MouseLeave
-        PictureBoxGlobix.Image = My.Resources._4_GLOBIX_INAKTIV_ZOO
-    End Sub
    Private Sub ZooFlowBeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZooFlowBeendenToolStripMenuItem.Click
        ExitZooflow()
    End Sub
@@ -1004,7 +986,7 @@ Public Class frmFlowForm
        End Select
    End Sub

-    Private Sub PictureBoxPM_Click(sender As Object, e As EventArgs) Handles PictureBoxPM.Click
+    Private Sub PictureBoxPM1_Click(sender As Object, e As EventArgs) Handles PictureBoxPM1.Click
        ToastNotificationsManager1.ShowNotification(ToastNotificationsManager1.Notifications(1))
    End Sub

--- a/GUIs.ZooFlow/frmtest.vb
+++ b/GUIs.ZooFlow/frmtest.vb
@@ -17,14 +17,14 @@ Public Class frmtest
            End If

        End If
-        oString = My.Application.Service.Client.NewFileStoreObject(txtIDB_OBJ_ID.Text, txtFilestoreType.Text, txtDate.Text, oextension, oKeepExtension)
+        oString = My.Application.Service.Client.CreateFileStoreObject(txtIDB_OBJ_ID.Text, txtFilestoreType.Text, txtDate.Text, oextension, oKeepExtension)
        txtIDBFOPath.Text = oString

    End Sub

    Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
        Dim oString As String
-        oString = My.Application.Service.Client.NewIDB_OBJ_ID("DOC", My.Application.User.UserName, "")
+        oString = My.Application.Service.Client.CreateObjectId("DOC", My.Application.User.UserName, "")
        txtIDB_OBJ_ID.Text = oString
    End Sub

@@ -36,7 +36,7 @@ Public Class frmtest
                Using oMemoryStream As New MemoryStream
                    oStream.CopyTo(oMemoryStream)
                    Dim oContents As Byte() = oMemoryStream.ToArray()
-                    oResult = Await My.Application.Service.Client.ImportIDBFOAsync(oContents, My.Application.User.UserName, txtIDB_OBJ_ID.Text, 1, txtIDBFOPath.Text)
+                    oResult = Await My.Application.Service.Client.ImportFileObjectAsync(oContents, My.Application.User.UserName, txtIDB_OBJ_ID.Text, 1, txtIDBFOPath.Text)
                End Using
            End Using

--- a/Modules.EDMIAPI/Client.vb
+++ b/Modules.EDMIAPI/Client.vb
@@ -7,7 +7,6 @@ Imports System.IO
 Public Class Client
    Private ReadOnly _logger As Logger
    Private ReadOnly _channelFactory As ChannelFactory(Of IEDMIServiceChannel)
-    Private _ServiceAddress As String
    Private _IPAddressServer As String
    Private _channel As IEDMIServiceChannel

@@ -34,7 +33,6 @@ Public Class Client
        _logger = LogConfig.GetLogger()

        Try
-            _ServiceAddress = ServiceAdress
            Dim oBinding = Channel.GetBinding()
            Dim oAddress = New EndpointAddress(ServiceAdress)
            Dim oFactory = New ChannelFactory(Of IEDMIServiceChannel)(oBinding, oAddress)
@@ -281,41 +279,56 @@ Public Class Client
            Throw ex
        End Try
    End Function
-    Public Function NewFileStoreObject(IDB_OBJ_ID As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As String) As String
+
+    Public Function CreateObjectId(pKindType As String, pWho As String, pBusinessEntity As String) As Long
        Try
+            Dim oArgs As New NewObjectIdRequest With {
+                .KindType = pKindType,
+                .BusinessEntity = pBusinessEntity,
+                .Who = pWho
+            }
+            Dim oResponse = _channel.NewObjectId(oArgs)
+            Return oResponse.ObjectId
+        Catch ex As Exception
+            _logger.Error(ex)
+            Throw ex
+        End Try
+    End Function
+
+    Public Function CreateFileStoreObject(pObjectId As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As String) As String
+        Try
+            ' Remove dot in Extension 
            If pExtension.StartsWith(".") Then
-                pExtension = pExtension.Replace(".", "")
+                pExtension = pExtension.Substring(1)
            End If
-            Dim oResponse = _channel.New_FileStore_Object(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension)
-            Return oResponse
+
+            Dim oArgs As New NewFileObjectRequest With {
+                .ObjectId = pObjectId,
+                .StoreType = pStoreType,
+                .DateImported = pDate,
+                .Extension = pExtension,
+                .KeepExtension = pKeepExtension
+            }
+            Dim oResponse = _channel.NewFileObject(oargs)
+            Return oResponse.FileObjectPath
        Catch ex As Exception
            _logger.Error(ex)
            Throw ex
        End Try
    End Function
-    Public Function NewIDB_OBJ_ID(pKindType As String, pWho As String, pBusinessEntity As String) As Long
-        Try
-            Dim oResponse = _channel.New_IDB_OBJECT(pKindType, pWho, pBusinessEntity)
-            Return oResponse
-        Catch ex As Exception
-            _logger.Error(ex)
-            Throw ex
-        End Try
-    End Function
-    Public Async Function ImportIDBFOAsync(pContent As Byte(), pWho As String, pIDB_OBJ_ID As Long, pObjectStoreID As Short, pIDBFOPath As String) As Task(Of Boolean)
-        Try
-            Dim oData As New DocumentImportIDBFORequest() With {
-                     .Contents = pContent,
-                     .pWho = pWho,
-                    .pIDBFilePath = pIDBFOPath,
-                    .pIDB_OBJ_ID = pIDB_OBJ_ID,
-                    .pObjectStoreID = pObjectStoreID
-                }

-            Dim oResponse = Await _channel.ImportNewIDBFOAsync(oData)
+    Public Async Function ImportFileObjectAsync(pContent As Byte(), pWho As String, pObjectId As Long, pObjectStoreID As Short, pFileObjectPath As String) As Task(Of Boolean)
+        Try
+            Dim oData As New ImportFileIntoFileObjectRequest() With {
+                .Contents = pContent,
+                .pWho = pWho,
+                .pIDBFilePath = pFileObjectPath,
+                .pIDB_OBJ_ID = pObjectId,
+                .pObjectStoreID = pObjectStoreID
+            }

+            Dim oResponse = Await _channel.ImportFileIntoFileObjectAsync(oData)
            Return oResponse.Result
-
        Catch ex As Exception
            _logger.Error(ex)
            Return False
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.datasource
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file is automatically generated by Visual Studio .Net. It is 
-    used to store generic object data source configuration information.  
-    Renaming the file extension or editing the content of this file may   
-    cause the file to be unrecognizable by the program.
-->
-<GenericObjectDataSource DisplayName="DocumentImportIDBFOResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
-   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
-</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="ImportFileIntoFileObjectResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="NewFileObjectResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource
+++ b/Services/EDMIServiceReference/DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    This file is automatically generated by Visual Studio .Net. It is 
+    used to store generic object data source configuration information.  
+    Renaming the file extension or editing the content of this file may   
+    cause the file to be unrecognizable by the program.
+-->
+<GenericObjectDataSource DisplayName="NewObjectIdResponse" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
+   <TypeInfo>DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse, Connected Services.EDMIServiceReference.Reference.vb.dll, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
+</GenericObjectDataSource>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.wsdl
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://DigitalData.Services.EDMIService" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://DigitalData.Services.EDMIService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+<wsdl:definitions xmlns:wsap="http://schemas.xmlsoap.org/ws/2004/08/addressing/policy" xmlns:wsa10="http://www.w3.org/2005/08/addressing" xmlns:tns="http://DigitalData.Services.EDMIService" xmlns:msc="http://schemas.microsoft.com/ws/2005/12/wsdl/contract" xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsam="http://www.w3.org/2007/05/addressing/metadata" xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://DigitalData.Services.EDMIService" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
  <wsdl:types>
    <xsd:schema targetNamespace="http://DigitalData.Services.EDMIService/Imports">
      <xsd:import namespace="http://DigitalData.Services.EDMIService" />
@@ -151,31 +151,31 @@
  <wsdl:message name="IEDMIService_ListFilesForUser_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q16="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q16:UnexpectedErrorFault" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_FileStore_Object_InputMessage">
-    <wsdl:part name="parameters" element="tns:New_FileStore_Object" />
+  <wsdl:message name="NewObjectIdRequest">
+    <wsdl:part name="parameters" element="tns:NewObjectIdRequest" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_FileStore_Object_OutputMessage">
-    <wsdl:part name="parameters" element="tns:New_FileStore_ObjectResponse" />
+  <wsdl:message name="NewObjectIdResponse">
+    <wsdl:part name="parameters" element="tns:NewObjectIdResponse" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_FileStore_Object_UnexpectedErrorFaultFault_FaultMessage">
+  <wsdl:message name="IEDMIService_NewObjectId_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q17="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q17:UnexpectedErrorFault" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_IDB_OBJECT_InputMessage">
-    <wsdl:part name="parameters" element="tns:New_IDB_OBJECT" />
+  <wsdl:message name="NewFileObjectRequest">
+    <wsdl:part name="parameters" element="tns:NewFileObjectRequest" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_IDB_OBJECT_OutputMessage">
-    <wsdl:part name="parameters" element="tns:New_IDB_OBJECTResponse" />
+  <wsdl:message name="NewFileObjectResponse">
+    <wsdl:part name="parameters" element="tns:NewFileObjectResponse" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_New_IDB_OBJECT_UnexpectedErrorFaultFault_FaultMessage">
+  <wsdl:message name="IEDMIService_NewFileObject_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q18="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q18:UnexpectedErrorFault" />
  </wsdl:message>
-  <wsdl:message name="DocumentImportIDBFORequest">
-    <wsdl:part name="parameters" element="tns:DocumentImportIDBFORequest" />
+  <wsdl:message name="ImportFileIntoFileObjectRequest">
+    <wsdl:part name="parameters" element="tns:ImportFileIntoFileObjectRequest" />
  </wsdl:message>
-  <wsdl:message name="DocumentImportIDBFOResponse">
-    <wsdl:part name="parameters" element="tns:DocumentImportIDBFOResponse" />
+  <wsdl:message name="ImportFileIntoFileObjectResponse">
+    <wsdl:part name="parameters" element="tns:ImportFileIntoFileObjectResponse" />
  </wsdl:message>
-  <wsdl:message name="IEDMIService_ImportNewIDBFO_UnexpectedErrorFaultFault_FaultMessage">
+  <wsdl:message name="IEDMIService_ImportFileIntoFileObject_UnexpectedErrorFaultFault_FaultMessage">
    <wsdl:part xmlns:q19="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptions" name="detail" element="q19:UnexpectedErrorFault" />
  </wsdl:message>
  <wsdl:portType name="IEDMIService">
@@ -255,20 +255,20 @@
      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse" name="DocumentListResponse" message="tns:DocumentListResponse" />
      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ListFilesForUser_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
-    <wsdl:operation name="New_FileStore_Object">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_Object" message="tns:IEDMIService_New_FileStore_Object_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectResponse" message="tns:IEDMIService_New_FileStore_Object_OutputMessage" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_New_FileStore_Object_UnexpectedErrorFaultFault_FaultMessage" />
+    <wsdl:operation name="NewObjectId">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId" name="NewObjectIdRequest" message="tns:NewObjectIdRequest" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdResponse" name="NewObjectIdResponse" message="tns:NewObjectIdResponse" />
+      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_NewObjectId_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
-    <wsdl:operation name="New_IDB_OBJECT">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECT" message="tns:IEDMIService_New_IDB_OBJECT_InputMessage" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTResponse" message="tns:IEDMIService_New_IDB_OBJECT_OutputMessage" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_New_IDB_OBJECT_UnexpectedErrorFaultFault_FaultMessage" />
+    <wsdl:operation name="NewFileObject">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject" name="NewFileObjectRequest" message="tns:NewFileObjectRequest" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectResponse" name="NewFileObjectResponse" message="tns:NewFileObjectResponse" />
+      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_NewFileObject_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
-    <wsdl:operation name="ImportNewIDBFO">
-      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFO" name="DocumentImportIDBFORequest" message="tns:DocumentImportIDBFORequest" />
-      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOResponse" name="DocumentImportIDBFOResponse" message="tns:DocumentImportIDBFOResponse" />
-      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ImportNewIDBFO_UnexpectedErrorFaultFault_FaultMessage" />
+    <wsdl:operation name="ImportFileIntoFileObject">
+      <wsdl:input wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject" name="ImportFileIntoFileObjectRequest" message="tns:ImportFileIntoFileObjectRequest" />
+      <wsdl:output wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectResponse" name="ImportFileIntoFileObjectResponse" message="tns:ImportFileIntoFileObjectResponse" />
+      <wsdl:fault wsaw:Action="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectUnexpectedErrorFaultFault" name="UnexpectedErrorFaultFault" message="tns:IEDMIService_ImportFileIntoFileObject_UnexpectedErrorFaultFault_FaultMessage" />
    </wsdl:operation>
  </wsdl:portType>
 </wsdl:definitions>
--- a/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
+++ b/Services/EDMIServiceReference/DigitalData.Services.EDMIService.xsd
@@ -226,41 +226,41 @@
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="New_FileStore_Object">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="IDB_OBJ_ID" type="xs:long" />
-        <xs:element minOccurs="0" name="pStoreType" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="pDate" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="pExtension" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="pKeepExtension" type="xs:boolean" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="New_FileStore_ObjectResponse">
-    <xs:complexType>
-      <xs:sequence>
-        <xs:element minOccurs="0" name="New_FileStore_ObjectResult" nillable="true" type="xs:string" />
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
-  <xs:element name="New_IDB_OBJECT">
+  <xs:element name="NewObjectIdRequest">
    <xs:complexType>
      <xs:sequence>
+        <xs:element minOccurs="0" name="BusinessEntity" nillable="true" type="xs:string" />
        <xs:element minOccurs="0" name="KindType" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="pWho" nillable="true" type="xs:string" />
-        <xs:element minOccurs="0" name="pBusinessEntity" nillable="true" type="xs:string" />
+        <xs:element minOccurs="0" name="Who" nillable="true" type="xs:string" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="New_IDB_OBJECTResponse">
+  <xs:element name="NewObjectIdResponse">
    <xs:complexType>
      <xs:sequence>
-        <xs:element minOccurs="0" name="New_IDB_OBJECTResult" nillable="true" type="xs:string" />
+        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="DocumentImportIDBFORequest">
+  <xs:element name="NewFileObjectRequest">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="DateImported" type="xs:dateTime" />
+        <xs:element minOccurs="0" name="Extension" nillable="true" type="xs:string" />
+        <xs:element minOccurs="0" name="KeepExtension" type="xs:boolean" />
+        <xs:element minOccurs="0" name="ObjectId" type="xs:long" />
+        <xs:element minOccurs="0" name="StoreType" nillable="true" type="xs:string" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="NewFileObjectResponse">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element minOccurs="0" name="FileObjectPath" nillable="true" type="xs:string" />
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="ImportFileIntoFileObjectRequest">
    <xs:complexType>
      <xs:sequence>
        <xs:element minOccurs="0" name="Contents" nillable="true" type="xs:base64Binary" />
@@ -271,7 +271,7 @@
      </xs:sequence>
    </xs:complexType>
  </xs:element>
-  <xs:element name="DocumentImportIDBFOResponse">
+  <xs:element name="ImportFileIntoFileObjectResponse">
    <xs:complexType>
      <xs:sequence>
        <xs:element minOccurs="0" name="Result" type="xs:boolean" />
--- a/Services/EDMIServiceReference/Reference.vb
+++ b/Services/EDMIServiceReference/Reference.vb
@@ -444,35 +444,37 @@ Namespace EDMIServiceReference
        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUser", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ListFilesForUserResponse")>  _
        Function ListFilesForUserAsync(ByVal request As EDMIServiceReference.ListFilesForUserRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentListResponse)
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_Object", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectResponse"& _ 
-            ""),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectUnexpect"& _ 
-            "edErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
+        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (NewObjectIdRequest) von Nachricht "NewObjectIdRequest" nicht mit dem Standardwert (NewObjectId) übereinstimmt.
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdResponse"),  _
+         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdUnexpectedErrorFa"& _ 
+            "ultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
-        Function New_FileStore_Object(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As String
+        Function NewObjectId(ByVal request As EDMIServiceReference.NewObjectIdRequest) As EDMIServiceReference.NewObjectIdResponse
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_Object", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_ObjectResponse"& _ 
-            "")>  _
-        Function New_FileStore_ObjectAsync(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As System.Threading.Tasks.Task(Of String)
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectIdResponse")>  _
+        Function NewObjectIdAsync(ByVal request As EDMIServiceReference.NewObjectIdRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse)
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECT", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTResponse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTUnexpectedErro"& _ 
-            "rFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
+        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (NewFileObjectRequest) von Nachricht "NewFileObjectRequest" nicht mit dem Standardwert (NewFileObject) übereinstimmt.
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectResponse"),  _
+         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectUnexpectedError"& _ 
+            "FaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
-        Function New_IDB_OBJECT(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As String
+        Function NewFileObject(ByVal request As EDMIServiceReference.NewFileObjectRequest) As EDMIServiceReference.NewFileObjectResponse
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECT", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECTResponse")>  _
-        Function New_IDB_OBJECTAsync(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As System.Threading.Tasks.Task(Of String)
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObjectResponse")>  _
+        Function NewFileObjectAsync(ByVal request As EDMIServiceReference.NewFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse)
        
-        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (DocumentImportIDBFORequest) von Nachricht "DocumentImportIDBFORequest" nicht mit dem Standardwert (ImportNewIDBFO) übereinstimmt.
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFO", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOResponse"),  _
-         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOUnexpectedErro"& _ 
-            "rFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
+        'CODEGEN: Der Nachrichtenvertrag wird generiert, da der Wrappername (ImportFileIntoFileObjectRequest) von Nachricht "ImportFileIntoFileObjectRequest" nicht mit dem Standardwert (ImportFileIntoFileObject) übereinstimmt.
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectResp"& _ 
+            "onse"),  _
+         System.ServiceModel.FaultContractAttribute(GetType(EDMIServiceReference.UnexpectedErrorFault), Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectUnex"& _ 
+            "pectedErrorFaultFault", Name:="UnexpectedErrorFault", [Namespace]:="http://schemas.datacontract.org/2004/07/DigitalData.Services.EDMIService.Exceptio"& _ 
            "ns")>  _
-        Function ImportNewIDBFO(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As EDMIServiceReference.DocumentImportIDBFOResponse
+        Function ImportFileIntoFileObject(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As EDMIServiceReference.ImportFileIntoFileObjectResponse
        
-        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFO", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFOResponse")>  _
-        Function ImportNewIDBFOAsync(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportIDBFOResponse)
+        <System.ServiceModel.OperationContractAttribute(Action:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject", ReplyAction:="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObjectResp"& _ 
+            "onse")>  _
+        Function ImportFileIntoFileObjectAsync(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse)
    End Interface
    
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
@@ -648,8 +650,108 @@ Namespace EDMIServiceReference
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportIDBFORequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class DocumentImportIDBFORequest
+     System.ServiceModel.MessageContractAttribute(WrapperName:="NewObjectIdRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class NewObjectIdRequest
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
+        Public BusinessEntity As String
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
+        Public KindType As String
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
+        Public Who As String
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String)
+            MyBase.New
+            Me.BusinessEntity = BusinessEntity
+            Me.KindType = KindType
+            Me.Who = Who
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(WrapperName:="NewObjectIdResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class NewObjectIdResponse
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
+        Public ObjectId As Long
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal ObjectId As Long)
+            MyBase.New
+            Me.ObjectId = ObjectId
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(WrapperName:="NewFileObjectRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class NewFileObjectRequest
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
+        Public DateImported As Date
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=1)>  _
+        Public Extension As String
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=2)>  _
+        Public KeepExtension As Boolean
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=3)>  _
+        Public ObjectId As Long
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=4)>  _
+        Public StoreType As String
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String)
+            MyBase.New
+            Me.DateImported = DateImported
+            Me.Extension = Extension
+            Me.KeepExtension = KeepExtension
+            Me.ObjectId = ObjectId
+            Me.StoreType = StoreType
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(WrapperName:="NewFileObjectResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class NewFileObjectResponse
+        
+        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
+        Public FileObjectPath As String
+        
+        Public Sub New()
+            MyBase.New
+        End Sub
+        
+        Public Sub New(ByVal FileObjectPath As String)
+            MyBase.New
+            Me.FileObjectPath = FileObjectPath
+        End Sub
+    End Class
+    
+    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
+     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
+     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
+     System.ServiceModel.MessageContractAttribute(WrapperName:="ImportFileIntoFileObjectRequest", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class ImportFileIntoFileObjectRequest
        
        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
        Public Contents() As Byte
@@ -683,8 +785,8 @@ Namespace EDMIServiceReference
    <System.Diagnostics.DebuggerStepThroughAttribute(),  _
     System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0"),  _
     System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced),  _
-     System.ServiceModel.MessageContractAttribute(WrapperName:="DocumentImportIDBFOResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
-    Partial Public Class DocumentImportIDBFOResponse
+     System.ServiceModel.MessageContractAttribute(WrapperName:="ImportFileIntoFileObjectResponse", WrapperNamespace:="http://DigitalData.Services.EDMIService", IsWrapped:=true)>  _
+    Partial Public Class ImportFileIntoFileObjectResponse
        
        <System.ServiceModel.MessageBodyMemberAttribute([Namespace]:="http://DigitalData.Services.EDMIService", Order:=0)>  _
        Public Result As Boolean
@@ -912,51 +1014,93 @@ Namespace EDMIServiceReference
            Return CType(Me,EDMIServiceReference.IEDMIService).ListFilesForUserAsync(inValue)
        End Function
        
-        Public Function New_FileStore_Object(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As String Implements EDMIServiceReference.IEDMIService.New_FileStore_Object
-            Return MyBase.Channel.New_FileStore_Object(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension)
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_NewObjectId(ByVal request As EDMIServiceReference.NewObjectIdRequest) As EDMIServiceReference.NewObjectIdResponse Implements EDMIServiceReference.IEDMIService.NewObjectId
+            Return MyBase.Channel.NewObjectId(request)
        End Function
        
-        Public Function New_FileStore_ObjectAsync(ByVal IDB_OBJ_ID As Long, ByVal pStoreType As String, ByVal pDate As String, ByVal pExtension As String, ByVal pKeepExtension As Boolean) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.New_FileStore_ObjectAsync
-            Return MyBase.Channel.New_FileStore_ObjectAsync(IDB_OBJ_ID, pStoreType, pDate, pExtension, pKeepExtension)
-        End Function
-        
-        Public Function New_IDB_OBJECT(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As String Implements EDMIServiceReference.IEDMIService.New_IDB_OBJECT
-            Return MyBase.Channel.New_IDB_OBJECT(KindType, pWho, pBusinessEntity)
-        End Function
-        
-        Public Function New_IDB_OBJECTAsync(ByVal KindType As String, ByVal pWho As String, ByVal pBusinessEntity As String) As System.Threading.Tasks.Task(Of String) Implements EDMIServiceReference.IEDMIService.New_IDB_OBJECTAsync
-            Return MyBase.Channel.New_IDB_OBJECTAsync(KindType, pWho, pBusinessEntity)
+        Public Function NewObjectId(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String) As Long
+            Dim inValue As EDMIServiceReference.NewObjectIdRequest = New EDMIServiceReference.NewObjectIdRequest()
+            inValue.BusinessEntity = BusinessEntity
+            inValue.KindType = KindType
+            inValue.Who = Who
+            Dim retVal As EDMIServiceReference.NewObjectIdResponse = CType(Me,EDMIServiceReference.IEDMIService).NewObjectId(inValue)
+            Return retVal.ObjectId
        End Function
        
        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_ImportNewIDBFO(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As EDMIServiceReference.DocumentImportIDBFOResponse Implements EDMIServiceReference.IEDMIService.ImportNewIDBFO
-            Return MyBase.Channel.ImportNewIDBFO(request)
+        Function EDMIServiceReference_IEDMIService_NewObjectIdAsync(ByVal request As EDMIServiceReference.NewObjectIdRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse) Implements EDMIServiceReference.IEDMIService.NewObjectIdAsync
+            Return MyBase.Channel.NewObjectIdAsync(request)
        End Function
        
-        Public Function ImportNewIDBFO(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As Boolean
-            Dim inValue As EDMIServiceReference.DocumentImportIDBFORequest = New EDMIServiceReference.DocumentImportIDBFORequest()
+        Public Function NewObjectIdAsync(ByVal BusinessEntity As String, ByVal KindType As String, ByVal Who As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewObjectIdResponse)
+            Dim inValue As EDMIServiceReference.NewObjectIdRequest = New EDMIServiceReference.NewObjectIdRequest()
+            inValue.BusinessEntity = BusinessEntity
+            inValue.KindType = KindType
+            inValue.Who = Who
+            Return CType(Me,EDMIServiceReference.IEDMIService).NewObjectIdAsync(inValue)
+        End Function
+        
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_NewFileObject(ByVal request As EDMIServiceReference.NewFileObjectRequest) As EDMIServiceReference.NewFileObjectResponse Implements EDMIServiceReference.IEDMIService.NewFileObject
+            Return MyBase.Channel.NewFileObject(request)
+        End Function
+        
+        Public Function NewFileObject(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String) As String
+            Dim inValue As EDMIServiceReference.NewFileObjectRequest = New EDMIServiceReference.NewFileObjectRequest()
+            inValue.DateImported = DateImported
+            inValue.Extension = Extension
+            inValue.KeepExtension = KeepExtension
+            inValue.ObjectId = ObjectId
+            inValue.StoreType = StoreType
+            Dim retVal As EDMIServiceReference.NewFileObjectResponse = CType(Me,EDMIServiceReference.IEDMIService).NewFileObject(inValue)
+            Return retVal.FileObjectPath
+        End Function
+        
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_NewFileObjectAsync(ByVal request As EDMIServiceReference.NewFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse) Implements EDMIServiceReference.IEDMIService.NewFileObjectAsync
+            Return MyBase.Channel.NewFileObjectAsync(request)
+        End Function
+        
+        Public Function NewFileObjectAsync(ByVal DateImported As Date, ByVal Extension As String, ByVal KeepExtension As Boolean, ByVal ObjectId As Long, ByVal StoreType As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.NewFileObjectResponse)
+            Dim inValue As EDMIServiceReference.NewFileObjectRequest = New EDMIServiceReference.NewFileObjectRequest()
+            inValue.DateImported = DateImported
+            inValue.Extension = Extension
+            inValue.KeepExtension = KeepExtension
+            inValue.ObjectId = ObjectId
+            inValue.StoreType = StoreType
+            Return CType(Me,EDMIServiceReference.IEDMIService).NewFileObjectAsync(inValue)
+        End Function
+        
+        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
+        Function EDMIServiceReference_IEDMIService_ImportFileIntoFileObject(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As EDMIServiceReference.ImportFileIntoFileObjectResponse Implements EDMIServiceReference.IEDMIService.ImportFileIntoFileObject
+            Return MyBase.Channel.ImportFileIntoFileObject(request)
+        End Function
+        
+        Public Function ImportFileIntoFileObject(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As Boolean
+            Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest()
            inValue.Contents = Contents
            inValue.pIDBFilePath = pIDBFilePath
            inValue.pIDB_OBJ_ID = pIDB_OBJ_ID
            inValue.pObjectStoreID = pObjectStoreID
            inValue.pWho = pWho
-            Dim retVal As EDMIServiceReference.DocumentImportIDBFOResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportNewIDBFO(inValue)
+            Dim retVal As EDMIServiceReference.ImportFileIntoFileObjectResponse = CType(Me,EDMIServiceReference.IEDMIService).ImportFileIntoFileObject(inValue)
            Return retVal.Result
        End Function
        
        <System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Advanced)>  _
-        Function EDMIServiceReference_IEDMIService_ImportNewIDBFOAsync(ByVal request As EDMIServiceReference.DocumentImportIDBFORequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportIDBFOResponse) Implements EDMIServiceReference.IEDMIService.ImportNewIDBFOAsync
-            Return MyBase.Channel.ImportNewIDBFOAsync(request)
+        Function EDMIServiceReference_IEDMIService_ImportFileIntoFileObjectAsync(ByVal request As EDMIServiceReference.ImportFileIntoFileObjectRequest) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse) Implements EDMIServiceReference.IEDMIService.ImportFileIntoFileObjectAsync
+            Return MyBase.Channel.ImportFileIntoFileObjectAsync(request)
        End Function
        
-        Public Function ImportNewIDBFOAsync(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.DocumentImportIDBFOResponse)
-            Dim inValue As EDMIServiceReference.DocumentImportIDBFORequest = New EDMIServiceReference.DocumentImportIDBFORequest()
+        Public Function ImportFileIntoFileObjectAsync(ByVal Contents() As Byte, ByVal pIDBFilePath As String, ByVal pIDB_OBJ_ID As Long, ByVal pObjectStoreID As Integer, ByVal pWho As String) As System.Threading.Tasks.Task(Of EDMIServiceReference.ImportFileIntoFileObjectResponse)
+            Dim inValue As EDMIServiceReference.ImportFileIntoFileObjectRequest = New EDMIServiceReference.ImportFileIntoFileObjectRequest()
            inValue.Contents = Contents
            inValue.pIDBFilePath = pIDBFilePath
            inValue.pIDB_OBJ_ID = pIDB_OBJ_ID
            inValue.pObjectStoreID = pObjectStoreID
            inValue.pWho = pWho
-            Return CType(Me,EDMIServiceReference.IEDMIService).ImportNewIDBFOAsync(inValue)
+            Return CType(Me,EDMIServiceReference.IEDMIService).ImportFileIntoFileObjectAsync(inValue)
        End Function
    End Class
 End Namespace
--- a/Services/EDMIServiceReference/service.wsdl
+++ b/Services/EDMIServiceReference/service.wsdl
@@ -225,36 +225,36 @@
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
-    <wsdl:operation name="New_FileStore_Object">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/New_FileStore_Object" style="document" />
-      <wsdl:input>
+    <wsdl:operation name="NewObjectId">
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewObjectId" style="document" />
+      <wsdl:input name="NewObjectIdRequest">
        <soap12:body use="literal" />
      </wsdl:input>
-      <wsdl:output>
+      <wsdl:output name="NewObjectIdResponse">
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
-    <wsdl:operation name="New_IDB_OBJECT">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/New_IDB_OBJECT" style="document" />
-      <wsdl:input>
+    <wsdl:operation name="NewFileObject">
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/NewFileObject" style="document" />
+      <wsdl:input name="NewFileObjectRequest">
        <soap12:body use="literal" />
      </wsdl:input>
-      <wsdl:output>
+      <wsdl:output name="NewFileObjectResponse">
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
        <soap12:fault use="literal" name="UnexpectedErrorFaultFault" namespace="" />
      </wsdl:fault>
    </wsdl:operation>
-    <wsdl:operation name="ImportNewIDBFO">
-      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportNewIDBFO" style="document" />
-      <wsdl:input name="DocumentImportIDBFORequest">
+    <wsdl:operation name="ImportFileIntoFileObject">
+      <soap12:operation soapAction="http://DigitalData.Services.EDMIService/IEDMIService/ImportFileIntoFileObject" style="document" />
+      <wsdl:input name="ImportFileIntoFileObjectRequest">
        <soap12:body use="literal" />
      </wsdl:input>
-      <wsdl:output name="DocumentImportIDBFOResponse">
+      <wsdl:output name="ImportFileIntoFileObjectResponse">
        <soap12:body use="literal" />
      </wsdl:output>
      <wsdl:fault name="UnexpectedErrorFaultFault">
--- a/Modules.EDMIAPI/EDMI.API.vbproj
+++ b/Modules.EDMIAPI/EDMI.API.vbproj
@@ -108,9 +108,6 @@
  </ItemGroup>
  <ItemGroup>
    <None Include="app.config" />
-    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportIDBFOResponse.datasource">
-      <DependentUpon>Reference.svcmap</DependentUpon>
-    </None>
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentImportResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
@@ -123,6 +120,15 @@
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.DocumentStreamResponse.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.ImportFileIntoFileObjectResponse.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewFileObjectResponse.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
+    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NewObjectIdResponse.datasource">
+      <DependentUpon>Reference.svcmap</DependentUpon>
+    </None>
    <None Include="Connected Services\EDMIServiceReference\DigitalData.Modules.EDMI.API.EDMIServiceReference.NonQueryResult.datasource">
      <DependentUpon>Reference.svcmap</DependentUpon>
    </None>
--- a/Service.EDMIService/EDMIService.vb
+++ b/Service.EDMIService/EDMIService.vb
@@ -519,54 +519,61 @@ Public Class EDMIService
            Return AccessRight.VIEW_ONLY
        End Try
    End Function
-    Public Function New_FileStore_Object(IDB_OBJ_ID As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As Boolean) As String Implements IEDMIService.New_FileStore_Object
+
+    Public Function NewObjectId(Data As NewObjectIdRequest) As NewObjectIdResponse Implements IEDMIService.NewObjectId
+        Try
+            Dim oSQL As String = $"DECLARE @NEW_IDB_OBJ_ID BIGINT
+                EXEC PRIDB_NEW_OBJECT '{Data.KindType}','{Data.Who}','{Data.BusinessEntity}',0, @IDB_OBJ_ID = @NEW_IDB_OBJ_ID OUTPUT;
+                SELECT @NEW_IDB_OBJ_ID"
+            Dim oObjectId = MSSQL_IDB.GetScalarValue(oSQL)
+            Return New NewObjectIdResponse With {.ObjectId = oObjectId}
+        Catch ex As Exception
+            _Logger.Error(ex)
+            Return New NewObjectIdResponse With {.ObjectId = 0}
+        End Try
+    End Function
+
+    Public Function NewFileObject(Data As NewFileObjectRequest) As NewFileObjectResponse Implements IEDMIService.NewFileObject
        Try
            Dim oRelpath As String
-            If pStoreType = String.Empty Then
-                pStoreType = ClassConstants.FileStoreWork
+            Dim oStoreType As String = Data.StoreType
+
+            If oStoreType = String.Empty Then
+                oStoreType = ClassConstants.FileStoreWork
            End If
-            oRelpath = GetFileStorePraefix(pStoreType)
-            If pDate = String.Empty Then
+
+            oRelpath = GetFileStorePraefix(oStoreType)
+
+            If IsNothing(Data.DateImported) Then
                oRelpath = GetFolderToday(oRelpath)
            Else
                Try
-                    Dim odate = CDate(pDate)
-                    oRelpath = GetFolderDate(oRelpath, odate)
+                    Dim oDate = CDate(Data.DateImported)
+                    oRelpath = GetFolderDate(oRelpath, oDate)
                Catch ex As Exception
-                    Return ""
+                    Dim oDetails As New UnexpectedErrorFault(ex)
+                    Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
                End Try
            End If
-            Dim oIDB_FileObject As String
-            If oRelpath = String.Empty Then
-                Return "ERROR"
-            Else
-                _Logger.Debug($"oRelpath is [{oRelpath}]")

-                oIDB_FileObject = Path.Combine(oRelpath, GetDigitalDataFileObject(IDB_OBJ_ID, pExtension, pKeepExtension))
-            End If
+            _Logger.Debug($"oRelpath is [{oRelpath}]")
+            Dim oFileObjectPath As String = Path.Combine(oRelpath, GetFileObjectFileName(Data.ObjectId, Data.Extension, Data.KeepExtension))
+            Return New NewFileObjectResponse With {.FileObjectPath = oFileObjectPath}
+        Catch ex As FaultException
+            _Logger.Error(ex)
+            Throw ex

-            Return oIDB_FileObject
        Catch ex As Exception
            _Logger.Error(ex)
-            Return ""
+            Dim oDetails As New UnexpectedErrorFault(ex)
+            Throw New FaultException(Of UnexpectedErrorFault)(oDetails, oDetails.ErrorMessage)
+
        End Try
    End Function

-    Public Function NewIDB_Object(pKindType As String, pWho As String, pBusinessEntity As String) As String Implements IEDMIService.New_IDB_OBJECT
-        Try
-            Dim oSQL As String = $"DECLARE @NEW_IDB_OBJ_ID BIGINT
-                EXEC PRIDB_NEW_OBJECT '{pKindType}','{pWho}','{pBusinessEntity}',0, @IDB_OBJ_ID = @NEW_IDB_OBJ_ID OUTPUT;
-                SELECT @NEW_IDB_OBJ_ID"
-            Dim oObjectId = MSSQL_IDB.GetScalarValue(oSQL)
-            Return oObjectId
-        Catch ex As Exception
-            _Logger.Error(ex)
-            Return 0
-        End Try
-    End Function
-    Public Function ImportFileIDBFO(Data As DocumentImportIDBFORequest) As DocumentImportIDBFOResponse Implements IEDMIService.ImportNewIDBFO
+    Public Function ImportFileIntoFileObject(Data As ImportFileIntoFileObjectRequest) As ImportFileIntoFileObjectResponse Implements IEDMIService.ImportFileIntoFileObject
        Dim oObjectStore = GlobalState.ObjectStores.First()
-        Dim EDMIPath = New EDMI.File.Path(LogConfig, oObjectStore.Path)
+        Dim oEDMIPath = New EDMI.File.Path(LogConfig, oObjectStore.Path)

        Try
            Using oStream = New FileStream(Data.pIDBFilePath, FileMode.Create, FileAccess.Write)
@@ -580,10 +587,9 @@ Public Class EDMIService

            ' insert into db
            Dim oSQL As String = $"EXEC PRIDB_NEW_IDBFO '{Data.pIDBFilePath}','{Data.pWho}','{Data.pIDB_OBJ_ID}',{Data.pObjectStoreID}"
-
            Dim oResult As Boolean = MSSQL_IDB.ExecuteNonQuery(oSQL)

-            Return New DocumentImportIDBFOResponse() With {.Result = oResult}
+            Return New ImportFileIntoFileObjectResponse() With {.Result = oResult}

        Catch ex As FaultException
            _Logger.Error(ex)
@@ -596,34 +602,33 @@ Public Class EDMIService

        End Try
    End Function
-    Private Function GetDigitalDataFileObject(IDB_OBJ_ID As Long, pExtension As String, pKeepExtension As Boolean) As String
+#End Region
+
+    Private Function GetFileObjectFileName(IDB_OBJ_ID As Long, pExtension As String, pKeepExtension As Boolean) As String
        If pKeepExtension Then
            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
-        Dim EDMIPath As String
        If pStoreType = ClassConstants.FileStoreArchive Then
            oObjectStore = GlobalState.ObjectStores.Item(0)
-        Else pStoreType = ClassConstants.FileStoreWork
+        Else 'pStoreType = ClassConstants.FileStoreWork
            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 = Now.ToString("yyyy-MM-dd")
+        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}]")
+                _Logger.Debug($"Created NEW todayFolder [{oFolderToday}]")
            Catch ex As Exception
                _Logger.Error(ex)
                Return ""
@@ -632,13 +637,13 @@ Public Class EDMIService
        Return oFolderToday
    End Function
    Private Function GetFolderDate(pRelationalPath As String, pDate As Date) As String
-        Dim oDateSubDirectoryName As String = pDate.ToString("yyyy-MM-dd")
+        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}]")
+                _Logger.Debug($"Created NEW DateSpecialFolder [{oFolderDateSepecial}]")
            Catch ex As Exception
                _Logger.Error(ex)
                Return ""
@@ -646,8 +651,9 @@ Public Class EDMIService
        End If
        Return oFolderDateSepecial
    End Function
+    Private Function GetDateSubDirectory([Date] As Date) As String
+        Return [Date].ToString("yyyy-MM-dd")
+    End Function


-
-#End Region
 End Class
--- a/Service.EDMIService/Helpers/Messages.vb
+++ b/Service.EDMIService/Helpers/Messages.vb
@@ -26,9 +26,9 @@ Namespace Messages
        Public ObjectId As Long
    End Class
 #End Region
-#Region "DocumentImportIDBFO"
+#Region "FileImport 2021"
    <MessageContract>
-    Public Class DocumentImportIDBFORequest
+    Public Class ImportFileIntoFileObjectRequest
        <MessageBodyMember>
        Public Contents() As Byte
        <MessageBodyMember>
@@ -42,10 +42,47 @@ Namespace Messages
    End Class

    <MessageContract>
-    Public Class DocumentImportIDBFOResponse
+    Public Class ImportFileIntoFileObjectResponse
        <MessageBodyMember>
        Public Result As Boolean
    End Class
+
+    <MessageContract>
+    Public Class NewObjectIdRequest
+        <MessageBodyMember>
+        Public KindType As String
+        <MessageBodyMember>
+        Public Who As String
+        <MessageBodyMember>
+        Public BusinessEntity As String
+    End Class
+
+    <MessageContract>
+    Public Class NewObjectIdResponse
+        <MessageBodyMember>
+        Public ObjectId As Long
+    End Class
+
+    <MessageContract>
+    Public Class NewFileObjectRequest
+        <MessageBodyMember>
+        Public ObjectId As Long
+        <MessageBodyMember>
+        Public StoreType As String
+        <MessageBodyMember>
+        Public DateImported As Date
+        <MessageBodyMember>
+        Public Extension As String
+        <MessageBodyMember>
+        Public KeepExtension As Boolean
+    End Class
+
+    <MessageContract>
+    Public Class NewFileObjectResponse
+        <MessageBodyMember>
+        Public FileObjectPath As String
+    End Class
+
 #End Region

 #Region "DocumentStream"
--- a/Service.EDMIService/IEDMIService.vb
+++ b/Service.EDMIService/IEDMIService.vb
@@ -81,14 +81,15 @@ Interface IEDMIService

    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
-    Function New_FileStore_Object(IDB_OBJ_ID As Long, pStoreType As String, pDate As String, pExtension As String, pKeepExtension As Boolean) As String
-    <OperationContract>
-    <FaultContract(GetType(UnexpectedErrorFault))>
-    Function New_IDB_OBJECT(KindType As String, pWho As String, pBusinessEntity As String) As String
+    Function NewObjectId(Data As NewObjectIdRequest) As NewObjectIdResponse

    <OperationContract>
    <FaultContract(GetType(UnexpectedErrorFault))>
-    Function ImportNewIDBFO(Data As DocumentImportIDBFORequest) As DocumentImportIDBFOResponse
+    Function NewFileObject(Data As NewFileObjectRequest) As NewFileObjectResponse
+
+    <OperationContract>
+    <FaultContract(GetType(UnexpectedErrorFault))>
+    Function ImportFileIntoFileObject(Data As ImportFileIntoFileObjectRequest) As ImportFileIntoFileObjectResponse
 #End Region

 End Interface
Author	SHA1	Message	Date
Jonathan Jenne	ca8f94810e	ZooFlow: Include new icons	2021-06-14 14:46:47 +02:00
Jonathan Jenne	ab1cb2c847	EDMI.API: Clean up Client	2021-06-14 14:46:32 +02:00
Jonathan Jenne	6fc4541567	EDMIService: clean up edmiservice	2021-06-14 14:46:15 +02:00