MS Optimizing, CurrentLocal

2020-12-30 14:12:26 +01:00
parent 93cc0acfbd
commit 00222efb88
21 changed files with 235 additions and 273 deletions
--- a/GUIs.ZooFlow/App.config
+++ b/GUIs.ZooFlow/App.config
@@ -2,6 +2,7 @@
 <configuration>
  <configSections>
    <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
+      <section name="DigitalData.GUIs.ZooFlow.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
      <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
    </sectionGroup>
  </configSections>
@@ -11,6 +12,11 @@
      providerName="System.Data.SqlClient" />
  </connectionStrings>
  <applicationSettings>
+    <DigitalData.GUIs.ZooFlow.Settings>
+      <setting name="UseAppConfigConString" serializeAs="String">
+        <value>True</value>
+      </setting>
+    </DigitalData.GUIs.ZooFlow.Settings>
    <DevExpress.LookAndFeel.Design.AppSettings>
      <setting name="DefaultAppSkin" serializeAs="String">
        <value>Skin/Office 2019 Colorful</value>
--- a/GUIs.ZooFlow/ApplicationEvents.vb
+++ b/GUIs.ZooFlow/ApplicationEvents.vb
@@ -1,4 +1,5 @@
 Imports DigitalData.Modules.Config
+Imports DigitalData.Modules.EDMI.API
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Logging.LogConfig

@@ -12,33 +13,63 @@ Namespace My
    Partial Friend Class MyApplication
        Private _Logger As Logger

-        Private _BaseUserConfigPath As String = Windows.Forms.Application.UserAppDataPath
+        Private oUserAppDataPath As String = Windows.Forms.Application.UserAppDataPath
        Private _BaseLocalUserConfigPath As String = Windows.Forms.Application.LocalUserAppDataPath
-        Private _BaseMachineConfigPath As String = Windows.Forms.Application.CommonAppDataPath
-        Private _BaseStartupPath As String = Windows.Forms.Application.StartupPath
+        Private oCommonAppDataPath As String = Windows.Forms.Application.CommonAppDataPath
+        Private oStartupPath As String = Windows.Forms.Application.StartupPath

        Public Sub App_Startup() Handles Me.Startup
            Dim oLogConfig As New LogConfig(LogPath:=PathType.AppData, CompanyName:="Digital Data", ProductName:="ZooFlow") With {.Debug = True}
-
+            If My.Settings.UseAppConfigConString = True Then
+                ' UserAppDataPath = StartupPath
+                oCommonAppDataPath = oStartupPath
+            End If
            ' System Config files like Service Url will be saved in %LocalAppdata% so they will remain on the machine
-            Dim oSystemConfigManager As New ConfigManager(Of ClassConfig)(oLogConfig,
-                                                                          _BaseLocalUserConfigPath,
-                                                                          _BaseMachineConfigPath,
-                                                                          _BaseStartupPath)
+            Dim oConfigManager As New ConfigManager(Of ClassConfig)(oLogConfig,
+                                                                          oUserAppDataPath,
+                                                                          oCommonAppDataPath,
+                                                                          oStartupPath)

            ' Layout files will be saved in %Appdata% (Roaming) so they will be syncronized with the user profile
-            Dim oUIConfigPath = IO.Path.Combine(_BaseUserConfigPath, ClassConstants.FOLDER_NAME_LAYOUT)
-            Dim oUIConfigAlternatePath = IO.Path.Combine(_BaseStartupPath, ClassConstants.FOLDER_NAME_LAYOUT)
+            Dim oUIConfigPath = IO.Path.Combine(oUserAppDataPath, ClassConstants.FOLDER_NAME_LAYOUT)
+            Dim oUIConfigAlternatePath = IO.Path.Combine(oUserAppDataPath, ClassConstants.FOLDER_NAME_LAYOUT)
            Dim oUIConfigManager As New ConfigManager(Of ClassUIConfig)(oLogConfig, oUIConfigPath, oUIConfigPath, oUIConfigAlternatePath)

+            'If oConfigManager.Config.ConnectionStringAppServer <> String.Empty Then
+            '    MyConStringAppserv = DecryptConnectionString(oConfigManager.Config.ConnectionStringAppServer)
+            '    If InitAppDatabase() Then
+            '        Logger.Debug("ConnectionStringAppServer will be used")
+            '    End If
+            'End If
+
+
            LogConfig = oLogConfig
            LogConfig.Debug = True

-            SystemConfigManager = oSystemConfigManager
+            SystemConfigManager = oConfigManager
            UIConfigManager = oUIConfigManager

            _Logger = LogConfig.GetLogger()
-            _Logger.Debug("Starting Client Suite..")
+            _Logger.Debug("Starting ZooFlow...")
+
+            If oConfigManager.Config.AppServerConfig <> String.Empty Then
+                Try
+                    Dim oSplit() As String = oConfigManager.Config.AppServerConfig.ToString.Split(":")
+                    Dim oAppServerAddress As String = oSplit(0)
+                    Dim oAppServerPort As Integer = 9000
+                    If oSplit.Length = 2 Then
+                        oAppServerPort = oSplit(1)
+                    End If
+                    _Client = New Client(LogConfig, oAppServerAddress, oAppServerPort)
+                    If Not IsNothing(_Client) Then
+                        If _Client.Connect() Then
+                            APPSERVER_ACTIVE = True
+                        End If
+                    End If
+                Catch ex As Exception
+                    _Logger.Warn($"Could not initialize the AppServer: {ex.Message}")
+                End Try
+            End If

            Dim oCommandLineArgs As New ClassCommandlineArgs(LogConfig)
            Dim oArgs = Environment.GetCommandLineArgs().Skip(1).ToList()
--- a/GUIs.ZooFlow/Config/ClassConfig.vb
+++ b/GUIs.ZooFlow/Config/ClassConfig.vb
@@ -42,7 +42,8 @@ Public Class ClassConfig

    <GlobalSetting>
    Public Property AppServerConfig As String = String.Empty
-
+    <ConnectionStringAppServer>
+    Public Property ConnectionStringAppServer As String = ""
    ' === Logging Configuration
    Public Property LogDebug As Boolean = False

--- a/Project/Settings.Designer.vb
+++ b/Project/Settings.Designer.vb
@@ -63,6 +63,15 @@ Partial Friend NotInheritable Class Settings
            Return CType(Me("IDBConnectionStringDEFAULT"),String)
        End Get
    End Property
+    
+    <Global.System.Configuration.ApplicationScopedSettingAttribute(),  _
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
+     Global.System.Configuration.DefaultSettingValueAttribute("True")>  _
+    Public ReadOnly Property UseAppConfigConString() As Boolean
+        Get
+            Return CType(Me("UseAppConfigConString"),Boolean)
+        End Get
+    End Property
 End Class

 Namespace My
--- a/Project/Settings.settings
+++ b/Project/Settings.settings
@@ -10,5 +10,8 @@
 &lt;/SerializableConnectionString&gt;</DesignTimeValue>
      <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=IDB_TEST;Persist Security Info=True;User ID=sa;Password=dd</Value>
    </Setting>
+    <Setting Name="UseAppConfigConString" Type="System.Boolean" Scope="Application">
+      <Value Profile="(Default)">True</Value>
+    </Setting>
  </Settings>
 </SettingsFile>
--- a/GUIs.ZooFlow/Search/ClassControlCreator.vb
+++ b/GUIs.ZooFlow/Search/ClassControlCreator.vb
@@ -184,7 +184,7 @@ Public Class ClassControlCreator
        'oMyNewGridControl.Size = New Size(CInt(pAttributeRow.Item("WIDTH")), CInt(pAttributeRow.Item("HEIGHT")))

        oView = CType(oMyNewGridControl.MainView, GridView)
-        oView.Appearance.EvenRow.BackColor = Color.FromArgb(255, 214, 49)
+        oView.Appearance.EvenRow.BackColor = Color.WhiteSmoke ' Color.FromArgb(255, 214, 49)
        oView.OptionsBehavior.Editable = False
        oView.OptionsBehavior.ReadOnly = True
        oView.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False
--- a/GUIs.ZooFlow/Search/frmSearchStart.Designer.vb
+++ b/GUIs.ZooFlow/Search/frmSearchStart.Designer.vb
@@ -52,6 +52,7 @@ Partial Class frmSearchStart
        Me.RibbonPageGroupProfiles = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupFilter = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupSettings = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
        Me.RepositoryItemTimeSpanEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTimeSpanEdit()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
@@ -75,7 +76,6 @@ Partial Class frmSearchStart
        Me.KlammerRechtsToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.KlammerEntfernenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.SplitContainerControlSearch = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemRadioGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -188,7 +188,7 @@ Partial Class frmSearchStart
        '
        'BarButtonStartSearch
        '
-        Me.BarButtonStartSearch.Caption = "Finden (F2)"
+        Me.BarButtonStartSearch.Caption = "Finden (F5)"
        Me.BarButtonStartSearch.Id = 9
        Me.BarButtonStartSearch.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonStartSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.BarButtonStartSearch.Name = "BarButtonStartSearch"
@@ -295,6 +295,13 @@ Partial Class frmSearchStart
        Me.RibbonPageGroupSettings.Name = "RibbonPageGroupSettings"
        Me.RibbonPageGroupSettings.Text = "Sucheinstellungen"
        '
+        'RibbonPageGroup1
+        '
+        Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonStartSearch)
+        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+        Me.RibbonPageGroup1.Text = "RibbonPageGroup1"
+        '
        'RepositoryItemTextEdit1
        '
        Me.RepositoryItemTextEdit1.AutoHeight = False
@@ -467,13 +474,6 @@ Partial Class frmSearchStart
        Me.SplitContainerControlSearch.SplitterPosition = 310
        Me.SplitContainerControlSearch.TabIndex = 16
        '
-        'RibbonPageGroup1
-        '
-        Me.RibbonPageGroup1.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonStartSearch)
-        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
-        Me.RibbonPageGroup1.Text = "RibbonPageGroup1"
-        '
        'frmSearchStart
        '
        Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True]
--- a/GUIs.ZooFlow/Search/frmSearchStart.resx
+++ b/GUIs.ZooFlow/Search/frmSearchStart.resx
@@ -188,36 +188,15 @@
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKgGAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDgx
-        LjIyNjUgNDguOTI1IiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8x
-        Ij4NCiAgPGRlZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiMxZDFkMWI7fS5jbHMtMntmaWxsOiNh
-        NTI0MzE7fS5jbHMtM3tmaWxsOm5vbmU7c3Ryb2tlOiMxZDFkMWI7c3Ryb2tlLXdpZHRoOjIuMTY4cHg7
-        fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAgPHBhdGggZD0iTTMzLjc0NCwyNy4yMDY4SDMxLjE4NWwtMS40
-        NDksNC45OTVoLS4wMjVsLTEuMzI3LTQuOTk1SDI2LjY3OGwtMS4zMjgsNC45OTVoLS4wMjRsLTEuNDUt
-        NC45OTVIMjEuMzE4bDIuODAyLDguNzcxaDIuMzE0bDEuMDg1LTQuNjI5aC4wMjRsMS4wODQsNC42Mjlo
-        Mi4zMTVabS0xNC44NjIsNC4zODZhMi4yMDQ3LDIuMjA0NywwLDEsMS00LjM4NSwwLDIuMjA0OCwyLjIw
-        NDgsMCwxLDEsNC4zODUsMG0yLjQzNiwwYTQuNjI5LDQuNjI5LDAsMSwwLTQuNjI5LDQuNjI5LDQuNTUx
-        MSw0LjU1MTEsMCwwLDAsNC42MjktNC42MjltLTkuNjIzLDIuMTkzSDguODkzdi02LjU3OUg2LjQ1N3Y4
-        Ljc3MWg0Ljk5NFpNNS40ODIsMjkuNGwtLjI0NC0yLjE5M0gwdjguNzcxSDIuNDM2di0zLjQxMUg1LjEx
-        N3YtMi4wNzFIMi40MzZWMjkuNFoiIGNsYXNzPSJjbHMtMSIgLz4NCiAgPHBhdGggZD0iTTMwLjk0MjEs
-        MjEuNDQxMWMwLDEuODI3LTEuNDYyLDIuMTkyLTIuODAyLDIuMTkydi00LjM4NWMxLjM0LDAsMi44MDIu
-        MzY1LDIuODAyLDIuMTkzbTIuNDM2LDBhNC4yNTMzLDQuMjUzMywwLDAsMC00LjI2NC00LjM4NmgtMy40
-        MTF2OC43NzFoMy40MTFhNC40MTcsNC40MTcsMCwwLDAsNC4yNjQtNC4zODVtLTkuMTM2LDQuMzg1di04
-        Ljc3MWgtMi40Mzd2NC4xNDJoLS4wMjRsLTIuNzc4LTQuMTQyaC0yLjE5MnY4Ljc3MWgyLjQzNnYtNC4x
-        NDJoLjAyNGwyLjc3OCw0LjE0MlptLTguODkzLTguNzcxaC0yLjQzNnY4Ljc3MWgyLjQzNlptLTMuNDEx
-        LDIuMTkzLS4yNDQtMi4xOTNINi40NTYxdjguNzcxaDIuNDM2di0zLjQxMWgyLjY4MXYtMi4wNzFIOC44
-        OTIxdi0xLjA5NloiIGNsYXNzPSJjbHMtMiIgLz4NCiAgPHBvbHlnb24gcG9pbnRzPSIzOS40NjEgMCAz
-        OS40NiA0OC45MjUgODEuMjI2IDI0LjQ2MyAzOS40NjEgMCIgY2xhc3M9ImNscy0yIiAvPg0KICA8cGF0
-        aCBkPSJNNTQuOTYzNiwzMS45MTU5YTEwLjQxODUsMTAuNDE4NSwwLDEsMC0xMC40MTgtMTAuNDE4QTEw
-        LjQxNzYsMTAuNDE3NiwwLDAsMCw1NC45NjM2LDMxLjkxNTlaIiBjbGFzcz0iY2xzLTMiIC8+DQogIDxw
-        YXRoIGQ9Ik02MS41NTE2LDIxLjMwMzdhNi41Nzg1LDYuNTc4NSwwLDAsMC0xMC4wNTQtNS41OTUsMy4w
-        NDU3LDMuMDQ1NywwLDAsMSwuNjczLDEuODk5LDMuMDc3NywzLjA3NzcsMCwwLDEtMy4wNzgsMy4wNzcs
-        My4wNCwzLjA0LDAsMCwxLS42NzktLjA4MSw2Ljc0ODUsNi43NDg1LDAsMCwwLS4wMzguNyw2LjU4OCw2
-        LjU4OCwwLDEsMCwxMy4xNzYsMCIgY2xhc3M9ImNscy0xIiAvPg0KICA8cGF0aCBkPSJNNjkuNTYxNSwx
-        Ni4zNTQzYTE4LjY0NDYsMTguNjQ0NiwwLDAsMC0yNC45MTYtNi44NzcsMTA0LjAzMTIsMTA0LjAzMTIs
-        MCwwLDEsMTEuMjA4LDEuMjQxYzUuOTgyLDEuMjQ0LDkuMDc0LDMuMjA0LDEzLjcwOCw1LjYzNiIgY2xh
-        c3M9ImNscy0xIiAvPg0KPC9zdmc+Cw==
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAALcBAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTmV4dCIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
+        MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KPC9zdHls
+        ZT4NCiAgPHBhdGggZD0iTTguOSw0LjFDOC40LDMuOCw4LDQuMSw4LDQuNnYyMC43YzAsMC42LDAuNCww
+        LjgsMC45LDAuNWwxNi44LTEwLjNjMC41LTAuMywwLjUtMC44LDAtMS4xTDguOSw0LjF6IiBjbGFzcz0i
+        Qmx1ZSIgLz4NCjwvc3ZnPgs=
 </value>
  </data>
  <data name="BarStaticItem1.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -114,6 +114,7 @@
    <Compile Include="Base\BaseClass.vb" />
    <Compile Include="ClassClipboardWatcher.vb" />
    <Compile Include="ClassCommandlineArgs.vb" />
+    <Compile Include="modCurrent.vb" />
    <Compile Include="Search\ClassControlCreator.vb" />
    <Compile Include="Globix\ClassFileDrop.vb" />
    <Compile Include="Globix\ClassFilehandle.vb" />
@@ -284,6 +285,10 @@
      <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
      <Name>Database</Name>
    </ProjectReference>
+    <ProjectReference Include="..\Modules.EDMIAPI\EDMI.API.vbproj">
+      <Project>{25017513-0d97-49d3-98d7-ba76d9b251b0}</Project>
+      <Name>EDMI.API</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Modules.Filesystem\Filesystem.vbproj">
      <Project>{991d0231-4623-496d-8bd0-9ca906029cbc}</Project>
      <Name>Filesystem</Name>
--- a/GUIs.ZooFlow/frmFlowForm.Designer.vb
+++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb
@@ -33,8 +33,6 @@ Partial Class frmFlowForm
        Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.UserVerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ZooFlowBeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ContextMenuForm = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.AlleAnzeigenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components)
        Me.PictureBoxAbo = New System.Windows.Forms.PictureBox()
        Me.PictureBoxDragDrop = New System.Windows.Forms.PictureBox()
@@ -45,7 +43,6 @@ Partial Class frmFlowForm
        Me.TimerCheckActiveForms = New System.Windows.Forms.Timer(Me.components)
        Me.TimerCheckDroppedFiles = New System.Windows.Forms.Timer(Me.components)
        Me.ContextMenuSystray.SuspendLayout()
-        Me.ContextMenuForm.SuspendLayout()
        CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -107,18 +104,6 @@ Partial Class frmFlowForm
        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
        Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
        '
-        'ContextMenuForm
-        '
-        Me.ContextMenuForm.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AlleAnzeigenToolStripMenuItem})
-        Me.ContextMenuForm.Name = "ContextMenuStrip1"
-        Me.ContextMenuForm.Size = New System.Drawing.Size(145, 26)
-        '
-        'AlleAnzeigenToolStripMenuItem
-        '
-        Me.AlleAnzeigenToolStripMenuItem.Name = "AlleAnzeigenToolStripMenuItem"
-        Me.AlleAnzeigenToolStripMenuItem.Size = New System.Drawing.Size(144, 22)
-        Me.AlleAnzeigenToolStripMenuItem.Text = "Alle anzeigen"
-        '
        'PictureBoxAbo
        '
        Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand
@@ -132,6 +117,7 @@ Partial Class frmFlowForm
        '
        'PictureBoxDragDrop
        '
+        Me.PictureBoxDragDrop.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
        Me.PictureBoxDragDrop.Dock = System.Windows.Forms.DockStyle.Left
        Me.PictureBoxDragDrop.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._1_LOGO_ZOO_FLOW
        Me.PictureBoxDragDrop.Location = New System.Drawing.Point(0, 0)
@@ -152,7 +138,6 @@ Partial Class frmFlowForm
        Me.PictureBoxGlobix.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
        Me.PictureBoxGlobix.TabIndex = 9
        Me.PictureBoxGlobix.TabStop = False
-        Me.PictureBoxGlobix.Visible = False
        '
        'PictureBoxPM
        '
@@ -166,7 +151,6 @@ Partial Class frmFlowForm
        Me.PictureBoxPM.TabIndex = 4
        Me.PictureBoxPM.TabStop = False
        Me.ToolTip1.SetToolTip(Me.PictureBoxPM, "ProcessManager starten")
-        Me.PictureBoxPM.Visible = False
        '
        'PictureBoxSearch
        '
@@ -200,7 +184,6 @@ 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.ContextMenuStrip = Me.ContextMenuForm
        Me.Controls.Add(Me.PictureBoxAbo)
        Me.Controls.Add(Me.PictureBoxDragDrop)
        Me.Controls.Add(Me.PictureBoxGlobix)
@@ -212,7 +195,6 @@ Partial Class frmFlowForm
        Me.Text = "frmFlowForm_Test1"
        Me.TopMost = True
        Me.ContextMenuSystray.ResumeLayout(False)
-        Me.ContextMenuForm.ResumeLayout(False)
        CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit()
@@ -228,8 +210,6 @@ Partial Class frmFlowForm
    Friend WithEvents ContextMenuSystray As ContextMenuStrip
    Friend WithEvents VerwaltungToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents ZooFlowBeendenToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents ContextMenuForm As ContextMenuStrip
-    Friend WithEvents AlleAnzeigenToolStripMenuItem As ToolStripMenuItem
    Friend WithEvents PictureBoxDragDrop As PictureBox
    Friend WithEvents TimerRefreshData As Timer
    Friend WithEvents PictureBoxAbo As PictureBox
--- a/GUIs.ZooFlow/frmFlowForm.resx
+++ b/GUIs.ZooFlow/frmFlowForm.resx
@@ -1956,14 +1956,11 @@
        AMADAADwDwAA
 </value>
  </data>
-  <metadata name="ContextMenuForm.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+  <metadata name="TimerRefreshData.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>461, 17</value>
  </metadata>
-  <metadata name="TimerRefreshData.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>615, 17</value>
-  </metadata>
  <metadata name="ToolTip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>764, 17</value>
+    <value>610, 17</value>
  </metadata>
  <data name="PictureBoxGlobix.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@@ -2041,9 +2038,9 @@
 </value>
  </data>
  <metadata name="TimerCheckActiveForms.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>863, 17</value>
+    <value>709, 17</value>
  </metadata>
  <metadata name="TimerCheckDroppedFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1045, 17</value>
+    <value>891, 17</value>
  </metadata>
 </root>
--- a/GUIs.ZooFlow/frmFlowForm.vb
+++ b/GUIs.ZooFlow/frmFlowForm.vb
@@ -203,11 +203,7 @@ Public Class frmFlowForm
    Private Sub ZooFlowBeendenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZooFlowBeendenToolStripMenuItem.Click
        ExitZooflow()
    End Sub
-    Private Sub AlleAnzeigenToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles AlleAnzeigenToolStripMenuItem.Click
-        For Each oControl As Control In Me.Controls
-            oControl.Visible = True
-        Next
-    End Sub
+
    Private Sub VerwaltungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles VerwaltungToolStripMenuItem.Click
        frmAdministrationZooFlow.Show()
    End Sub
--- a/GUIs.ZooFlow/frmSplash.Designer.vb
+++ b/GUIs.ZooFlow/frmSplash.Designer.vb
@@ -27,7 +27,6 @@ Partial Class frmSplash
        Me.txtActionName = New DevExpress.XtraEditors.LabelControl()
        Me.Version = New DevExpress.XtraEditors.LabelControl()
        Me.ProgressBarControl1 = New DevExpress.XtraEditors.ProgressBarControl()
-        Me.Button1 = New System.Windows.Forms.Button()
        Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit()
        Me.pictureEdit2 = New DevExpress.XtraEditors.PictureEdit()
        CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -73,20 +72,12 @@ Partial Class frmSplash
        Me.ProgressBarControl1.Size = New System.Drawing.Size(509, 18)
        Me.ProgressBarControl1.TabIndex = 15
        '
-        'Button1
-        '
-        Me.Button1.Location = New System.Drawing.Point(446, 141)
-        Me.Button1.Name = "Button1"
-        Me.Button1.Size = New System.Drawing.Size(75, 23)
-        Me.Button1.TabIndex = 16
-        Me.Button1.Text = "Stop"
-        Me.Button1.UseVisualStyleBackColor = True
-        '
        'PictureEdit1
        '
        Me.PictureEdit1.EditValue = CType(resources.GetObject("PictureEdit1.EditValue"), Object)
        Me.PictureEdit1.Location = New System.Drawing.Point(247, 255)
        Me.PictureEdit1.Name = "PictureEdit1"
+        Me.PictureEdit1.Properties.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder
        Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto]
        Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom
        Me.PictureEdit1.Size = New System.Drawing.Size(274, 53)
@@ -116,7 +107,6 @@ Partial Class frmSplash
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(533, 320)
        Me.Controls.Add(Me.PictureEdit1)
-        Me.Controls.Add(Me.Button1)
        Me.Controls.Add(Me.ProgressBarControl1)
        Me.Controls.Add(Me.pictureEdit2)
        Me.Controls.Add(Me.Version)
@@ -136,6 +126,5 @@ End Sub
    Private WithEvents Version As DevExpress.XtraEditors.LabelControl
    Friend WithEvents ProgressBarControl1 As DevExpress.XtraEditors.ProgressBarControl
    Private WithEvents pictureEdit2 As DevExpress.XtraEditors.PictureEdit
-    Friend WithEvents Button1 As Button
    Friend WithEvents PictureEdit1 As DevExpress.XtraEditors.PictureEdit
 End Class
--- a/GUIs.ZooFlow/frmSplash.vb
+++ b/GUIs.ZooFlow/frmSplash.vb
@@ -27,7 +27,5 @@ Public Class frmSplash
        SetActionName
    End Enum

-    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
-        MsgBox("Stop")
-    End Sub
+
 End Class
--- a/GUIs.ZooFlow/modCurrent.vb
+++ b/GUIs.ZooFlow/modCurrent.vb
@@ -0,0 +1,6 @@
+Imports DigitalData.Modules.EDMI.API
+
+Module modCurrent
+    Public _Client As Client
+    Public APPSERVER_ACTIVE As Boolean = False
+End Module