MS

GUIs.ZooFlow/frmFlowForm.Designer.vb

@@ -30,11 +30,6 @@ 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.BasisKonfigurationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.VerwaltungToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator()
@@ -59,7 +54,7 @@ Partial Class frmFlowForm
         Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
         Me.Bar3 = New DevExpress.XtraBars.Bar()
         Me.BarSubItem1 = New DevExpress.XtraBars.BarSubItem()
-        Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItemGlobixGE = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem()
         Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
@@ -101,76 +96,42 @@ Partial Class frmFlowForm
         '
         'ContextMenuSystray
         '
-        Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.GlobixToolStripMenuItem, Me.UserKonfigurationToolStripMenuItem, Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem})
+        Me.ContextMenuSystray.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripSeparator1, Me.VerwaltungToolStripMenuItem, Me.ToolStripSeparator3, Me.TestToolStripMenuItem, Me.ToolStripSeparator2, Me.ZooFlowBeendenToolStripMenuItem})
         Me.ContextMenuSystray.Name = "ContextMenuSystray"
-        Me.ContextMenuSystray.Size = New System.Drawing.Size(174, 132)
+        Me.ContextMenuSystray.Size = New System.Drawing.Size(170, 88)
-        '
-        '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, Me.BasisKonfigurationToolStripMenuItem})
-        Me.UserKonfigurationToolStripMenuItem.Name = "UserKonfigurationToolStripMenuItem"
-        Me.UserKonfigurationToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
-        Me.UserKonfigurationToolStripMenuItem.Text = "User Konfiguration"
-        '
-        'DatenbankverbindungToolStripMenuItem
-        '
-        Me.DatenbankverbindungToolStripMenuItem.Name = "DatenbankverbindungToolStripMenuItem"
-        Me.DatenbankverbindungToolStripMenuItem.Size = New System.Drawing.Size(192, 22)
-        Me.DatenbankverbindungToolStripMenuItem.Text = "Datenbankverbindung"
-        '
-        'BasisKonfigurationToolStripMenuItem
-        '
-        Me.BasisKonfigurationToolStripMenuItem.Name = "BasisKonfigurationToolStripMenuItem"
-        Me.BasisKonfigurationToolStripMenuItem.Size = New System.Drawing.Size(192, 22)
-        Me.BasisKonfigurationToolStripMenuItem.Text = "Basis Konfiguration"
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(170, 6)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(166, 6)
         '
         'VerwaltungToolStripMenuItem
         '
         Me.VerwaltungToolStripMenuItem.Image = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.gear_32xLG
         Me.VerwaltungToolStripMenuItem.Name = "VerwaltungToolStripMenuItem"
-        Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.VerwaltungToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
         Me.VerwaltungToolStripMenuItem.Text = "Verwaltung"
         '
         'ToolStripSeparator3
         '
         Me.ToolStripSeparator3.Name = "ToolStripSeparator3"
-        Me.ToolStripSeparator3.Size = New System.Drawing.Size(170, 6)
+        Me.ToolStripSeparator3.Size = New System.Drawing.Size(166, 6)
         '
         'TestToolStripMenuItem
         '
         Me.TestToolStripMenuItem.Name = "TestToolStripMenuItem"
-        Me.TestToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.TestToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
         Me.TestToolStripMenuItem.Text = "Test"
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(170, 6)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(166, 6)
         '
         'ZooFlowBeendenToolStripMenuItem
         '
         Me.ZooFlowBeendenToolStripMenuItem.Name = "ZooFlowBeendenToolStripMenuItem"
-        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(173, 22)
+        Me.ZooFlowBeendenToolStripMenuItem.Size = New System.Drawing.Size(169, 22)
         Me.ZooFlowBeendenToolStripMenuItem.Text = "ZooFlow beenden"
         '
         'PictureBoxAbo
@@ -332,7 +293,7 @@ Partial Class frmFlowForm
         Me.BarManager1.DockControls.Add(Me.barDockControlLeft)
         Me.BarManager1.DockControls.Add(Me.barDockControlRight)
         Me.BarManager1.Form = Me
-        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.buttonExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem1, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9})
+        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.BarSubItem1, Me.buttonExitZooflow, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem1, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItemGlobixGE})
         Me.BarManager1.MaxItemId = 11
         Me.BarManager1.StatusBar = Me.Bar3
         '
@@ -358,16 +319,16 @@ Partial Class frmFlowForm
         Me.BarSubItem1.Caption = "Menu"
         Me.BarSubItem1.Id = 0
         Me.BarSubItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarSubItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem9), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem6), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem7), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonExitZooflow)})
+        Me.BarSubItem1.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem8), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItemGlobixGE), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem6), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem7), New DevExpress.XtraBars.LinkPersistInfo(Me.BarButtonItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonExitZooflow)})
         Me.BarSubItem1.Name = "BarSubItem1"
         Me.BarSubItem1.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
         '
-        'BarButtonItem9
+        'BarButtonItemGlobixGE
         '
-        Me.BarButtonItem9.Caption = "Einstellungen Globix"
+        Me.BarButtonItemGlobixGE.Caption = "Grundeinstellungen Globix"
-        Me.BarButtonItem9.Id = 10
+        Me.BarButtonItemGlobixGE.Id = 10
-        Me.BarButtonItem9.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem9.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItemGlobixGE.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem9.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem9.Name = "BarButtonItem9"
+        Me.BarButtonItemGlobixGE.Name = "BarButtonItemGlobixGE"
         '
         'BarButtonItem6
         '
@@ -511,19 +472,14 @@ Partial Class frmFlowForm
     Friend WithEvents TimerRefreshData As Timer
     Friend WithEvents PictureBoxAbo As PictureBox
     Friend WithEvents ToolTip1 As ToolTip
-    Friend WithEvents UserKonfigurationToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
-    Friend WithEvents DatenbankverbindungToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents TimerFolderwatch As Timer
-    Friend WithEvents GlobixToolStripMenuItem As ToolStripMenuItem
-    Friend WithEvents TsiGlobixConfig As ToolStripMenuItem
     Friend WithEvents TestToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents PictureBoxSearch1 As DevExpress.XtraEditors.SvgImageBox
     Friend WithEvents PictureBoxPM As DevExpress.XtraEditors.SvgImageBox
     Friend WithEvents PictureBoxGlobix As DevExpress.XtraEditors.SvgImageBox
     Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
     Friend WithEvents ToolStripSeparator3 As ToolStripSeparator
-    Friend WithEvents BasisKonfigurationToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents pnlQuicksearch1 As Panel
     Friend WithEvents PictureEdit1 As PictureEdit
     Friend WithEvents TextEdit1 As TextEdit
@@ -547,5 +503,5 @@ Partial Class frmFlowForm
     Friend WithEvents BarButtonItem7 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem8 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents Panel2 As Panel
-    Friend WithEvents BarButtonItem9 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItemGlobixGE As DevExpress.XtraBars.BarButtonItem
 End Class

GUIs.ZooFlow/frmFlowForm.vb

@@ -310,8 +310,9 @@ Public Class frmFlowForm
 
                 Init_Folderwatch()
                 Folderwatch_CheckFiles()
-                GlobixToolStripMenuItem.Visible = True
+                BarButtonItemGlobixGE.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
-
+            Else
+                BarButtonItemGlobixGE.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
             End If
 
 
@@ -571,18 +572,6 @@ Public Class frmFlowForm
         Return True
     End Function
 
-    Private Sub DatenbankverbindungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenbankverbindungToolStripMenuItem.Click
-        Dim oForm As New frmSQLConfig(My.LogConfig) With {
-            .ConnectionString = My.SystemConfig.ConnectionString,
-            .FormTitle = "ECM Datenbank"
-        }
-        Dim oResult = oForm.ShowDialog()
-
-        If oResult = DialogResult.OK Then
-            My.SystemConfig.ConnectionString = oForm.ConnectionString
-            My.SystemConfigManager.Save()
-        End If
-    End Sub
 
     Private Sub DatenbankverbindungToolStripMenuItem1_Click(sender As Object, e As EventArgs)
         Dim oForm As New frmSQLConfig(My.LogConfig) With {
@@ -936,10 +925,6 @@ Public Class frmFlowForm
 
     End Sub
 
-    Private Sub TsiGlobixConfig_Click(sender As Object, e As EventArgs) Handles TsiGlobixConfig.Click
-        frmGlobixBasicConfig.ShowDialog()
-    End Sub
-
     Private Sub Watcher_ClipboardChanged(sender As Object, e As IDataObject)
         Dim ClipboardContents As String = Clipboard.GetText().Trim()
         Dim oState = My.Application.ClipboardWatcher
@@ -1113,10 +1098,6 @@ Public Class frmFlowForm
 
     End Sub
 
-    Private Async Sub BasisKonfigurationToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles BasisKonfigurationToolStripMenuItem.Click
-        frmConfigBasic.ShowDialog()
-        Await ConfigureQuicksearch1(True)
-    End Sub
 
     Private Sub ShowErrorMessage(pEx As Exception)
         Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2)
@@ -1242,7 +1223,7 @@ Public Class frmFlowForm
         Await ConfigureQuicksearch1(True)
     End Sub
 
-    Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem9.ItemClick
+    Private Sub BarButtonItem9_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItemGlobixGE.ItemClick
         frmGlobixBasicConfig.ShowDialog()
     End Sub