Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/Monorepo

2021-02-12 14:05:51 +01:00 · 2021-02-12 14:05:51 +01:00 · 6506364b30
commit 6506364b30
parent c67742ee5b 7e6a7c6db3
11 changed files with 177 additions and 149 deletions
--- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb
+++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb
@ -86,7 +86,7 @@ Partial Class frmDocumentResultList
        Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
        Me.RibbonControl.ShowToolbarCustomizeItem = False
-        Me.RibbonControl.Size = New System.Drawing.Size(1189, 131)
+        Me.RibbonControl.Size = New System.Drawing.Size(1189, 132)
        Me.RibbonControl.StatusBar = Me.RibbonStatusBar
        Me.RibbonControl.Toolbar.ShowCustomizeItem = False
        '
@ -213,6 +213,7 @@ Partial Class frmDocumentResultList
        Me.labelWarning.ItemAppearance.Normal.BackColor = System.Drawing.Color.White
        Me.labelWarning.ItemAppearance.Normal.Options.UseBackColor = True
        Me.labelWarning.Name = "labelWarning"
+        Me.labelWarning.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
        Me.labelWarning.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
        '
        'RibbonPage1
@ -249,10 +250,10 @@ Partial Class frmDocumentResultList
        Me.RibbonStatusBar.ItemLinks.Add(Me.labelResultCount)
        Me.RibbonStatusBar.ItemLinks.Add(Me.labelCriticalError)
        Me.RibbonStatusBar.ItemLinks.Add(Me.labelWarning)
-        Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 649)
+        Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 647)
        Me.RibbonStatusBar.Name = "RibbonStatusBar"
        Me.RibbonStatusBar.Ribbon = Me.RibbonControl
-        Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 22)
+        Me.RibbonStatusBar.Size = New System.Drawing.Size(1189, 24)
        '
        'SplitContainerControl1
        '
@ -264,7 +265,7 @@ Partial Class frmDocumentResultList
        Me.SplitContainerControl1.Panel1.Text = "Panel1"
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2)
        Me.SplitContainerControl1.Panel2.Text = "Panel2"
-        Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 518)
+        Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 515)
        Me.SplitContainerControl1.SplitterPosition = 382
        Me.SplitContainerControl1.TabIndex = 2
        Me.SplitContainerControl1.Text = "SplitContainerControl1"
@ -276,7 +277,7 @@ Partial Class frmDocumentResultList
        Me.GridControl1.MainView = Me.GridView1
        Me.GridControl1.MenuManager = Me.RibbonControl
        Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(382, 518)
+        Me.GridControl1.Size = New System.Drawing.Size(382, 515)
        Me.GridControl1.TabIndex = 0
        Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
        '
@ -317,7 +318,7 @@ Partial Class frmDocumentResultList
        Me.SplitContainerControl2.Panel1.Text = "Panel1"
        Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3)
        Me.SplitContainerControl2.Panel2.Text = "Panel2"
-        Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 518)
+        Me.SplitContainerControl2.Size = New System.Drawing.Size(370, 515)
        Me.SplitContainerControl2.SplitterPosition = 223
        Me.SplitContainerControl2.TabIndex = 0
        Me.SplitContainerControl2.Text = "SplitContainerControl2"
@ -362,7 +363,7 @@ Partial Class frmDocumentResultList
        Me.GridControl3.MainView = Me.GridView3
        Me.GridControl3.MenuManager = Me.RibbonControl
        Me.GridControl3.Name = "GridControl3"
-        Me.GridControl3.Size = New System.Drawing.Size(370, 285)
+        Me.GridControl3.Size = New System.Drawing.Size(370, 282)
        Me.GridControl3.TabIndex = 0
        Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3})
        '
@ -391,13 +392,13 @@ Partial Class frmDocumentResultList
        'SplitContainerControl3
        '
        Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 131)
+        Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 132)
        Me.SplitContainerControl3.Name = "SplitContainerControl3"
        Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1)
        Me.SplitContainerControl3.Panel1.Text = "Panel1"
        Me.SplitContainerControl3.Panel2.Controls.Add(Me.DocumentViewer1)
        Me.SplitContainerControl3.Panel2.Text = "Panel2"
-        Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 518)
+        Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 515)
        Me.SplitContainerControl3.SplitterPosition = 762
        Me.SplitContainerControl3.TabIndex = 5
        Me.SplitContainerControl3.Text = "SplitContainerControl3"
@ -408,7 +409,7 @@ Partial Class frmDocumentResultList
        Me.DocumentViewer1.FileLoaded = False
        Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
        Me.DocumentViewer1.Name = "DocumentViewer1"
-        Me.DocumentViewer1.Size = New System.Drawing.Size(417, 518)
+        Me.DocumentViewer1.Size = New System.Drawing.Size(417, 515)
        Me.DocumentViewer1.TabIndex = 0
        '
        'XtraSaveFileDialog
--- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
+++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb
@ -101,7 +101,7 @@ Public Class frmDocumentResultList
            End If
            DocumentViewer1.Init(_LogConfig, _Environment.Settings.GdPictureKey)

-            ' Load config
+            'Load config
            SplitContainerControl1.SplitterPosition = _Config.Config.SplitContainer1Distance
            SwitchMainContainerHorizontal.Checked = _Config.Config.SplitContainer1Horizontal
            SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance
--- a/GUIs.ZooFlow/ClassConstants.vb
+++ b/GUIs.ZooFlow/ClassConstants.vb
@ -37,4 +37,7 @@

    Public Const IDB_VECTOR_TYPE_INTEGER = 9
    Public Const IDB_VECTOR_TYPE_STRING = 8
+
+    Public Const IDB_ADDED_WHEN_String_German = "Erstellt Wann"
+    Public Const IDB_ADDED_WHEN_String_Englisch = "Added when"
 End Class
--- a/GUIs.ZooFlow/ClassDataASorDB.vb
+++ b/GUIs.ZooFlow/ClassDataASorDB.vb
@ -56,6 +56,7 @@ Public Class ClassDataASorDB
                My.Application.User.ShortName = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_SHORTNAME"))
                My.Application.User.Email = IIf(IsDBNull(DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL")), "", DT_CHECKUSER_MODULE.Rows(0).Item("USER_EMAIL"))
                My.Application.User.Language = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE")
+                My.Application.User.LanguageID = DT_CHECKUSER_MODULE.Rows(0).Item("USER_LANGUAGE_ID")
                My.Application.User.DateFormat = DT_CHECKUSER_MODULE.Rows(0).Item("USER_DATE_FORMAT")

                My.Application.User.IsAdmin = DT_CHECKUSER_MODULE.Rows(0).Item("IS_ADMIN")
--- a/GUIs.ZooFlow/ClassInit.vb
+++ b/GUIs.ZooFlow/ClassInit.vb
@ -276,6 +276,8 @@ Public Class ClassInit
                MyApplication.User.DateFormat = NotNull(oValue.ToString, "dd.MM.yyyy")
            Case "USER_LANGUAGE"
                MyApplication.User.Language = NotNull(oValue.ToString, "de-DE")
+            Case "USER_LANGUAGEID"
+                MyApplication.User.LanguageID = CShort(oValue)
        End Select
    End Sub
    Private Sub HandleModuleInfo(MyApplication As My.MyApplication, ModuleName As String, Row As DataRow)
--- a/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.Designer.vb
@ -262,7 +262,7 @@ Partial Class frmFlowSearch
        '
        'BarEditItemDate
        '
-        Me.BarEditItemDate.Caption = "Attribut "
+        Me.BarEditItemDate.Caption = "Attribut Datum"
        Me.BarEditItemDate.Edit = Me.RepositoryItemComboBox1
        Me.BarEditItemDate.EditWidth = 120
        Me.BarEditItemDate.Id = 12
--- a/GUIs.ZooFlow/Search/frmFlowSearch.vb
+++ b/GUIs.ZooFlow/Search/frmFlowSearch.vb
@ -3,6 +3,7 @@ Imports DevExpress.XtraEditors
 Imports DigitalData.GUIs.Common
 Imports DevExpress.XtraSplashScreen
 Imports DevExpress.XtraBars
+Imports DigitalData.GUIs.ZooFlow.ClassConstants

 Public Class frmFlowSearch
    Private Logger As Logger
@ -37,7 +38,12 @@ Public Class frmFlowSearch
        Try
            TileControlMatch.Groups.Clear()
            Dim oDT As DataTable = ASorDB.GetDatatable("IDB", $"SELECT * FROM VWIDB_BE_ATTRIBUTE", "VWIDB_BE_ATTRIBUTE", "", "ATTR_TITLE")
-            RepositoryItemComboBox1.Items.Add("Erstellt Wann")
+            If My.Application.User.Language = "de-DE" Then
+                RepositoryItemComboBox1.Items.Add(IDB_ADDED_WHEN_String_German)
+            Else
+                RepositoryItemComboBox1.Items.Add(IDB_ADDED_WHEN_String_Englisch)
+            End If
+
            For Each oRow As DataRow In oDT.Rows
                If oRow.Item("TYPE_ID") = 5 Then
                    RepositoryItemComboBox1.Items.Add(oRow.Item("ATTR_TITLE"))
@ -64,7 +70,7 @@ Public Class frmFlowSearch
            oEditor = TryCast(RibbonControl1.Manager.ActiveEditor, ComboBoxEdit)
            oEditValue = oEditor.EditValue

-            If oEditValue = "Erstellt Wann" Or oEditValue = "Added when" Then
+            If oEditValue = IDB_ADDED_WHEN_String_German Or oEditValue = IDB_ADDED_WHEN_String_Englisch Then
                SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN"
            Else
                SEARCH_FACT_DATE_ATTRIBUTE = oEditValue
@ -104,10 +110,13 @@ Public Class frmFlowSearch
                If SEARCH_FACT_DATE_ATTRIBUTE = "ADDED_WHEN" Then
                    oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
                Else
-                    oSQL = oSQL.Replace("AND MONTH(OBJ.ADDED_WHEN) <> 13", "")
-                    oSQL = oSQL.Replace("--@INNERJOIN_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE GRP_DATE ON MD.IDB_OBJ_ID = GRP_DATE.IDB_OBJ_ID")
+                    If SEARCH_FACT_DATE = "MONTH(OBJ.ADDED_WHEN) <> 13" Then
+                        SEARCH_FACT_DATE = $"MONTH(GRPDATE.[{SEARCH_FACT_DATE_ATTRIBUTE}]) <> 13"
+                    End If
+                    oSQL = oSQL.Replace("MONTH(OBJ.ADDED_WHEN) <> 13", SEARCH_FACT_DATE)
+                    oSQL = oSQL.Replace("--INNER JOIN VWIDB_GROUP_DATA_DATE", "INNER JOIN VWIDB_GROUP_DATA_DATE")
+                    End If
                End If
-            End If
            Dim oResultCountAttributes As Integer = 0
            TileControlMatch.Groups.Clear()

@ -480,4 +489,8 @@ Public Class frmFlowSearch
        StartSearch_Full("")
        CheckButton1.Checked = True
    End Sub
+
+    Private Sub BarEditItemDate_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarEditItemDate.ItemClick
+
+    End Sub
 End Class
--- a/GUIs.ZooFlow/frmFlowForm.Designer.vb
+++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb
@ -27,6 +27,8 @@ Partial Class frmFlowForm
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowForm))
        Me.NotifyIcon = New System.Windows.Forms.NotifyIcon(Me.components)
        Me.ContextMenuSystray = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.GlobixToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.TsiGlobixConfig = New System.Windows.Forms.ToolStripMenuItem()
        Me.UserKonfigurationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.DatenbankverbindungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
@ -34,26 +36,24 @@ Partial Class frmFlowForm
        Me.ZooFlowBeendenToolStripMenuItem = 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.PictureBox1 = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxAbo = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxDragDrop = New System.Windows.Forms.PictureBox()
        Me.PictureBoxGlobix = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxPM = New System.Windows.Forms.PictureBox()
-        Me.PictureBoxSearch = New System.Windows.Forms.PictureBox()
-        Me.GlobixToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.TsiGlobixConfig = New System.Windows.Forms.ToolStripMenuItem()
        Me.ContextMenuSystray.SuspendLayout()
-        CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.PictureBoxGlobix, 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.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'SplashScreenManager
@ -73,6 +73,21 @@ Partial Class frmFlowForm
        Me.ContextMenuSystray.Name = "ContextMenuSystray"
        Me.ContextMenuSystray.Size = New System.Drawing.Size(174, 98)
        '
+        'GlobixToolStripMenuItem
+        '
+        Me.GlobixToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsiGlobixConfig})
+        Me.GlobixToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.GLOBIX_short
+        Me.GlobixToolStripMenuItem.Name = "GlobixToolStripMenuItem"
+        Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.GlobixToolStripMenuItem.Text = "Globix"
+        Me.GlobixToolStripMenuItem.Visible = False
+        '
+        'TsiGlobixConfig
+        '
+        Me.TsiGlobixConfig.Name = "TsiGlobixConfig"
+        Me.TsiGlobixConfig.Size = New System.Drawing.Size(178, 22)
+        Me.TsiGlobixConfig.Text = "Grundeinstellungen"
+        '
        'UserKonfigurationToolStripMenuItem
        '
        Me.UserKonfigurationToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.DatenbankverbindungToolStripMenuItem})
@ -103,6 +118,55 @@ Partial Class frmFlowForm
        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
        Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
        '
+        'PictureBoxAbo
+        '
+        Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand
+        Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo
+        Me.PictureBoxAbo.Location = New System.Drawing.Point(209, 75)
+        Me.PictureBoxAbo.Name = "PictureBoxAbo"
+        Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36)
+        Me.PictureBoxAbo.TabIndex = 11
+        Me.PictureBoxAbo.TabStop = False
+        Me.ToolTip1.SetToolTip(Me.PictureBoxAbo, "Abonnierte Suchen")
+        '
+        '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)
+        Me.PictureBoxDragDrop.Name = "PictureBoxDragDrop"
+        Me.PictureBoxDragDrop.Size = New System.Drawing.Size(197, 150)
+        Me.PictureBoxDragDrop.TabIndex = 10
+        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
@ -132,29 +196,6 @@ Partial Class frmFlowForm
        Me.PictureBox1.TabIndex = 12
        Me.PictureBox1.TabStop = False
        '
-        'PictureBoxAbo
-        '
-        Me.PictureBoxAbo.Cursor = System.Windows.Forms.Cursors.Hand
-        Me.PictureBoxAbo.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources._2_ZOO_FLOW_Abo
-        Me.PictureBoxAbo.Location = New System.Drawing.Point(209, 75)
-        Me.PictureBoxAbo.Name = "PictureBoxAbo"
-        Me.PictureBoxAbo.Size = New System.Drawing.Size(40, 36)
-        Me.PictureBoxAbo.TabIndex = 11
-        Me.PictureBoxAbo.TabStop = False
-        Me.ToolTip1.SetToolTip(Me.PictureBoxAbo, "Abonnierte Suchen")
-        '
-        '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)
-        Me.PictureBoxDragDrop.Name = "PictureBoxDragDrop"
-        Me.PictureBoxDragDrop.Size = New System.Drawing.Size(197, 150)
-        Me.PictureBoxDragDrop.TabIndex = 10
-        Me.PictureBoxDragDrop.TabStop = False
-        Me.ToolTip1.SetToolTip(Me.PictureBoxDragDrop, "Drag and Drop files here")
-        '
        'PictureBoxGlobix
        '
        Me.PictureBoxGlobix.BackColor = System.Drawing.Color.Transparent
@ -167,47 +208,6 @@ Partial Class frmFlowForm
        Me.PictureBoxGlobix.TabIndex = 9
        Me.PictureBoxGlobix.TabStop = False
        '
-        '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")
-        '
-        'GlobixToolStripMenuItem
-        '
-        Me.GlobixToolStripMenuItem.DropDownItems.AddRange(New System.Windows.Forms.ToolStripItem() {Me.TsiGlobixConfig})
-        Me.GlobixToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.GLOBIX_short
-        Me.GlobixToolStripMenuItem.Name = "GlobixToolStripMenuItem"
-        Me.GlobixToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
-        Me.GlobixToolStripMenuItem.Text = "Globix"
-        Me.GlobixToolStripMenuItem.Visible = False
-        '
-        'TsiGlobixConfig
-        '
-        Me.TsiGlobixConfig.Name = "TsiGlobixConfig"
-        Me.TsiGlobixConfig.Size = New System.Drawing.Size(178, 22)
-        Me.TsiGlobixConfig.Text = "Grundeinstellungen"
-        '
        'frmFlowForm
        '
        Me.AllowDrop = True
@ -227,17 +227,18 @@ Partial Class frmFlowForm
        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
        Me.Name = "frmFlowForm"
-        Me.Text = "frmFlowForm_Test1"
+        Me.Text = "ZooFlow"
        Me.TopMost = True
        Me.ContextMenuSystray.ResumeLayout(False)
-        CType(Me.ToastNotificationsManager1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBoxAbo, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.PictureBoxDragDrop, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.PictureBoxGlobix, 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.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBoxGlobix, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)

    End Sub
--- a/GUIs.ZooFlow/frmFlowForm.resx
+++ b/GUIs.ZooFlow/frmFlowForm.resx
@ -1962,49 +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>
-  <metadata name="TimerCheckActiveForms.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <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>891, 17</value>
-  </metadata>
-  <metadata name="TimerFolderwatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1079, 17</value>
-  </metadata>
-  <metadata name="ToastNotificationsManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1228, 17</value>
-  </metadata>
-  <data name="PictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAFpvb207zwn+vAAAAKdJREFUOE+1
-        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>
  <data name="PictureBoxPM.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAAGsAAABQCAYAAAAeAotiAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAL
@ -2056,6 +2013,49 @@
        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>
+  <metadata name="TimerCheckDroppedFiles.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>891, 17</value>
+  </metadata>
+  <metadata name="TimerFolderwatch.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1079, 17</value>
+  </metadata>
+  <metadata name="ToastNotificationsManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>1228, 17</value>
+  </metadata>
+  <data name="PictureBox1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAFpvb207zwn+vAAAAKdJREFUOE+1
+        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
@ -395,6 +395,10 @@ Public Class frmFlowForm
        Logger.Debug("OnEvent called!")
    End Sub
    Private Sub PictureBox1_Click(sender As Object, e As EventArgs) Handles PictureBox1.Click
+
+        Open_FlowSearch()
+    End Sub
+    Sub Open_FlowSearch()
        Cursor = Cursors.WaitCursor
        If TheFormIsAlreadyLoaded("frmFlowSearch") Then
            Cursor = Cursors.Default
@ -408,29 +412,31 @@ Public Class frmFlowForm
        Next
        If oSQLFlowSearch <> String.Empty Then
            oSQLFlowSearch = oSQLFlowSearch.Replace("@USER_ID", My.Application.User.UserId)
+            oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE_ID", My.Application.User.LanguageID)
+            oSQLFlowSearch = oSQLFlowSearch.Replace("@LANGUAGE", My.Application.User.Language)
            Dim oForm As New frmFlowSearch(oSQLFlowSearch)
            oForm.Show()
            oForm.BringToFront()
        End If

        Cursor = Cursors.Default
-
    End Sub

    Private Sub PictureBoxSearch_Click(sender As Object, e As EventArgs) Handles PictureBoxSearch.Click
-        Cursor = Cursors.WaitCursor
-        If TheFormIsAlreadyLoaded("frmSearchStart") Then
-            Cursor = Cursors.Default
-            Exit Sub
-        End If
+        Open_FlowSearch()
+        'Cursor = Cursors.WaitCursor
+        'If TheFormIsAlreadyLoaded("frmSearchStart") Then
+        '    Cursor = Cursors.Default
+        '    Exit Sub
+        'End If


-        Dim oForm As New frmSearchStart(DTIDB_SEARCHES) 'frmFlowSearch(osql) 
-        oForm.Show()
-        Cursor = Cursors.Default
-        If TimerCheckActiveForms.Enabled = False Then
-            TimerCheckActiveForms.Enabled = True
-        End If
+        'Dim oForm As New frmSearchStart(DTIDB_SEARCHES) 'frmFlowSearch(osql) 
+        'oForm.Show()
+        'Cursor = Cursors.Default
+        'If TimerCheckActiveForms.Enabled = False Then
+        '    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
--- a/Modules.ZooFlow/State/UserState.vb
+++ b/Modules.ZooFlow/State/UserState.vb
@ -14,6 +14,7 @@ Namespace State
        Public Property MachineName As String
        Public Property DateFormat As String
        Public Property Language As String
+        Public Property LanguageID As Int16
        Public Property IsAdmin As Boolean = False

        Public Property HideBasicConfig As Boolean = False