rename frmMain to frmAdmin, work on result forms

ClipboardWatcher/ClipboardWatcher.vbproj

@@ -144,6 +144,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\Common\Common.vbproj">
+      <Project>{D20A6BF2-C7C6-4A7A-B34D-FA27D775A049}</Project>
+      <Name>Common</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules.Database\Database.vbproj">
       <Project>{EAF0EA75-5FA7-485D-89C7-B2D843B03A96}</Project>
       <Name>Database</Name>

ClipboardWatcher/frmMatch.vb

@@ -208,28 +208,28 @@ Public Class frmMatch
 
         If OpenType = ProfileType.ANY Or OpenType = ProfileType.DOCS_ONLY Then
             ' Show Result Document Form
-            Dim oForm As New frmDocumentResult(_LogConfig, _Environment, _Params)
+            Dim oForm As New frmResult(_LogConfig, _Environment, _Params, frmResult.ResultType.Document)
             AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed
             OpenForms.Add(oForm)
 
             oForm.Show()
         End If
 
-        'If OpenType = ProfileType.ANY Or OpenType = ProfileType.DATA_ONLY Then
+        If OpenType = ProfileType.ANY Or OpenType = ProfileType.DATA_ONLY Then
-        '    ' Show Result Data Form
+            ' Show Result Data Form
-        '    Dim oForm As New frmResultSQL(Me, oMatchingProfiles)
+            Dim oForm As New frmResult(_LogConfig, _Environment, _Params, frmResult.ResultType.Data)
-        '    AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed
+            AddHandler oForm.FormClosed, AddressOf ProfileResultForm_Closed
-        '    OpenForms.Add(oForm)
+            OpenForms.Add(oForm)
 
-        '    oForm.Show()
+            oForm.Show()
-        'End If
+        End If
     End Sub
 
     Private Sub ProfileResultForm_Closed(sender As Object, e As FormClosedEventArgs)
         Dim oShouldOpenAgain As Boolean = False
         Dim oThisForm = New List(Of IResultForm) From {sender}
 
-        If TypeOf sender Is frmResultDoc Or TypeOf sender Is frmDocumentResult Then
+        If TypeOf sender Is frmResult Then
             For Each oForm As IResultForm In OpenForms
                 ' Determine if frmProfileMatch should be shown
                 If oForm.ShouldReturnToMatchForm Then

Common/Common.vbproj

@@ -82,10 +82,10 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="frmDocumentResult.Designer.vb">
+    <Compile Include="frmResult.Designer.vb">
-      <DependentUpon>frmDocumentResult.vb</DependentUpon>
+      <DependentUpon>frmResult.vb</DependentUpon>
     </Compile>
-    <Compile Include="frmDocumentResult.vb">
+    <Compile Include="frmResult.vb">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="IResultForm.vb" />
@@ -106,8 +106,8 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="frmDocumentResult.resx">
+    <EmbeddedResource Include="frmResult.resx">
-      <DependentUpon>frmDocumentResult.vb</DependentUpon>
+      <DependentUpon>frmResult.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="My Project\licenses.licx" />
     <EmbeddedResource Include="My Project\Resources.resx">

Common/frmResult.Designer.vb

@@ -1,5 +1,5 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
-Partial Class frmDocumentResult
+Partial Class frmResult
     Inherits DevExpress.XtraEditors.XtraForm
 
     'Form overrides dispose to clean up the component list.
@@ -19,14 +19,16 @@ Partial Class frmDocumentResult
     'Do not modify it using the code editor.
     <System.Diagnostics.DebuggerStepThrough()> _
     Private Sub InitializeComponent()
+        Me.components = New System.ComponentModel.Container()
         Me.XtraTabControl = New DevExpress.XtraTab.XtraTabControl()
         Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
         Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
         Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.BarManager1 = New DevExpress.XtraBars.BarManager()
+        Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
         Me.Bar2 = New DevExpress.XtraBars.Bar()
         Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
         Me.Bar3 = New DevExpress.XtraBars.Bar()
+        Me.LabelStatus = New DevExpress.XtraBars.BarStaticItem()
         Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
         Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl()
         Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl()
@@ -43,7 +45,6 @@ Partial Class frmDocumentResult
         Me.XtraTabPage5 = New DevExpress.XtraTab.XtraTabPage()
         Me.GridControl5 = New DevExpress.XtraGrid.GridControl()
         Me.GridView5 = New DevExpress.XtraGrid.Views.Grid.GridView()
-        Me.LabelStatus = New DevExpress.XtraBars.BarStaticItem()
         CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabControl.SuspendLayout()
         Me.XtraTabPage1.SuspendLayout()
@@ -70,7 +71,7 @@ Partial Class frmDocumentResult
         Me.XtraTabControl.Location = New System.Drawing.Point(0, 20)
         Me.XtraTabControl.Name = "XtraTabControl"
         Me.XtraTabControl.SelectedTabPage = Me.XtraTabPage1
-        Me.XtraTabControl.Size = New System.Drawing.Size(697, 483)
+        Me.XtraTabControl.Size = New System.Drawing.Size(796, 483)
         Me.XtraTabControl.TabIndex = 0
         Me.XtraTabControl.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2, Me.XtraTabPage3, Me.XtraTabPage4, Me.XtraTabPage5})
         '
@@ -78,7 +79,7 @@ Partial Class frmDocumentResult
         '
         Me.XtraTabPage1.Controls.Add(Me.GridControl1)
         Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(691, 455)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(790, 455)
         Me.XtraTabPage1.Text = "XtraTabPage1"
         '
         'GridControl1
@@ -88,7 +89,7 @@ Partial Class frmDocumentResult
         Me.GridControl1.MainView = Me.GridView1
         Me.GridControl1.MenuManager = Me.BarManager1
         Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(691, 455)
+        Me.GridControl1.Size = New System.Drawing.Size(790, 455)
         Me.GridControl1.TabIndex = 0
         Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
         '
@@ -141,13 +142,19 @@ Partial Class frmDocumentResult
         Me.Bar3.OptionsBar.UseWholeRow = True
         Me.Bar3.Text = "Statusleiste"
         '
+        'LabelStatus
+        '
+        Me.LabelStatus.Caption = "Status"
+        Me.LabelStatus.Id = 1
+        Me.LabelStatus.Name = "LabelStatus"
+        '
         'barDockControlTop
         '
         Me.barDockControlTop.CausesValidation = False
         Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top
         Me.barDockControlTop.Location = New System.Drawing.Point(0, 0)
         Me.barDockControlTop.Manager = Me.BarManager1
-        Me.barDockControlTop.Size = New System.Drawing.Size(697, 20)
+        Me.barDockControlTop.Size = New System.Drawing.Size(796, 20)
         '
         'barDockControlBottom
         '
@@ -155,7 +162,7 @@ Partial Class frmDocumentResult
         Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.barDockControlBottom.Location = New System.Drawing.Point(0, 503)
         Me.barDockControlBottom.Manager = Me.BarManager1
-        Me.barDockControlBottom.Size = New System.Drawing.Size(697, 25)
+        Me.barDockControlBottom.Size = New System.Drawing.Size(796, 25)
         '
         'barDockControlLeft
         '
@@ -169,7 +176,7 @@ Partial Class frmDocumentResult
         '
         Me.barDockControlRight.CausesValidation = False
         Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
-        Me.barDockControlRight.Location = New System.Drawing.Point(697, 20)
+        Me.barDockControlRight.Location = New System.Drawing.Point(796, 20)
         Me.barDockControlRight.Manager = Me.BarManager1
         Me.barDockControlRight.Size = New System.Drawing.Size(0, 483)
         '
@@ -177,7 +184,7 @@ Partial Class frmDocumentResult
         '
         Me.XtraTabPage2.Controls.Add(Me.GridControl2)
         Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(691, 457)
+        Me.XtraTabPage2.Size = New System.Drawing.Size(790, 455)
         Me.XtraTabPage2.Text = "XtraTabPage2"
         '
         'GridControl2
@@ -187,7 +194,7 @@ Partial Class frmDocumentResult
         Me.GridControl2.MainView = Me.GridView2
         Me.GridControl2.MenuManager = Me.BarManager1
         Me.GridControl2.Name = "GridControl2"
-        Me.GridControl2.Size = New System.Drawing.Size(691, 457)
+        Me.GridControl2.Size = New System.Drawing.Size(790, 455)
         Me.GridControl2.TabIndex = 0
         Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2})
         '
@@ -200,7 +207,7 @@ Partial Class frmDocumentResult
         '
         Me.XtraTabPage3.Controls.Add(Me.GridControl3)
         Me.XtraTabPage3.Name = "XtraTabPage3"
-        Me.XtraTabPage3.Size = New System.Drawing.Size(691, 457)
+        Me.XtraTabPage3.Size = New System.Drawing.Size(790, 455)
         Me.XtraTabPage3.Text = "XtraTabPage3"
         '
         'GridControl3
@@ -210,7 +217,7 @@ Partial Class frmDocumentResult
         Me.GridControl3.MainView = Me.GridView3
         Me.GridControl3.MenuManager = Me.BarManager1
         Me.GridControl3.Name = "GridControl3"
-        Me.GridControl3.Size = New System.Drawing.Size(691, 457)
+        Me.GridControl3.Size = New System.Drawing.Size(790, 455)
         Me.GridControl3.TabIndex = 0
         Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3})
         '
@@ -223,7 +230,7 @@ Partial Class frmDocumentResult
         '
         Me.XtraTabPage4.Controls.Add(Me.GridControl4)
         Me.XtraTabPage4.Name = "XtraTabPage4"
-        Me.XtraTabPage4.Size = New System.Drawing.Size(691, 457)
+        Me.XtraTabPage4.Size = New System.Drawing.Size(790, 455)
         Me.XtraTabPage4.Text = "XtraTabPage4"
         '
         'GridControl4
@@ -233,7 +240,7 @@ Partial Class frmDocumentResult
         Me.GridControl4.MainView = Me.GridView4
         Me.GridControl4.MenuManager = Me.BarManager1
         Me.GridControl4.Name = "GridControl4"
-        Me.GridControl4.Size = New System.Drawing.Size(691, 457)
+        Me.GridControl4.Size = New System.Drawing.Size(790, 455)
         Me.GridControl4.TabIndex = 0
         Me.GridControl4.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView4})
         '
@@ -246,7 +253,7 @@ Partial Class frmDocumentResult
         '
         Me.XtraTabPage5.Controls.Add(Me.GridControl5)
         Me.XtraTabPage5.Name = "XtraTabPage5"
-        Me.XtraTabPage5.Size = New System.Drawing.Size(691, 457)
+        Me.XtraTabPage5.Size = New System.Drawing.Size(790, 455)
         Me.XtraTabPage5.Text = "XtraTabPage5"
         '
         'GridControl5
@@ -256,7 +263,7 @@ Partial Class frmDocumentResult
         Me.GridControl5.MainView = Me.GridView5
         Me.GridControl5.MenuManager = Me.BarManager1
         Me.GridControl5.Name = "GridControl5"
-        Me.GridControl5.Size = New System.Drawing.Size(691, 457)
+        Me.GridControl5.Size = New System.Drawing.Size(790, 455)
         Me.GridControl5.TabIndex = 0
         Me.GridControl5.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView5})
         '
@@ -265,24 +272,18 @@ Partial Class frmDocumentResult
         Me.GridView5.GridControl = Me.GridControl5
         Me.GridView5.Name = "GridView5"
         '
-        'LabelStatus
+        'frmResult
-        '
-        Me.LabelStatus.Caption = "Status"
-        Me.LabelStatus.Id = 1
-        Me.LabelStatus.Name = "LabelStatus"
-        '
-        'frmDocumentResult
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(697, 528)
+        Me.ClientSize = New System.Drawing.Size(796, 528)
         Me.Controls.Add(Me.XtraTabControl)
         Me.Controls.Add(Me.barDockControlLeft)
         Me.Controls.Add(Me.barDockControlRight)
         Me.Controls.Add(Me.barDockControlBottom)
         Me.Controls.Add(Me.barDockControlTop)
-        Me.Name = "frmDocumentResult"
+        Me.Name = "frmResult"
-        Me.Text = "frmDocumentResult"
+        Me.Text = "Ergebnis"
         CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit()
         Me.XtraTabControl.ResumeLayout(False)
         Me.XtraTabPage1.ResumeLayout(False)

Common/frmResult.vb

@@ -10,7 +10,7 @@ Imports DigitalData.Modules.ZooFlow
 Imports DigitalData.Modules.ZooFlow.Params
 Imports Patterns.ClassPatterns
 
-Public Class frmDocumentResult
+Public Class frmResult
     Implements IResultForm
 
     Private _LogConfig As LogConfig
@@ -20,8 +20,9 @@ Public Class frmDocumentResult
     Private _DocumentSearches As DataTable
     Private _MatchingProfiles As List(Of ProfileData)
     Private _Database As MSSQLServer
+    Private _ResultType As ResultType
 
-    Private Class DocSearch
+    Private Class Search
         Public DataTable As DataTable
         Public TabIndex As Integer
         Public TabCaption As String
@@ -29,9 +30,14 @@ Public Class frmDocumentResult
         Public SQLCommand As String
     End Class
 
+    Public Enum ResultType
+        Data
+        Document
+    End Enum
+
     Public Property ShouldReturnToMatchForm As Boolean = False Implements IResultForm.ShouldReturnToMatchForm
 
-    Public Sub New(LogConfig As LogConfig, Environment As Environment, Params As ClipboardWatcherParams)
+    Public Sub New(LogConfig As LogConfig, Environment As Environment, Params As ClipboardWatcherParams, ResultType As ResultType)
         ' Dieser Aufruf ist für den Designer erforderlich.
         InitializeComponent()
 
@@ -39,29 +45,43 @@ Public Class frmDocumentResult
         _MatchingProfiles = Params.MatchingProfiles
         _LogConfig = LogConfig
         _Logger = LogConfig.GetLogger
+        _Database = Environment.Database
+        _Environment = Environment
+        _Params = Params
+        _ResultType = ResultType
     End Sub
 
-    Private Async Sub frmDocumentResult_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+    Private Async Sub frmResult_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         GridView1.ShowLoadingPanel()
 
-        Dim oSearches = Await LoadSearchesAsync()
+        Dim oSearches As New List(Of Search)
 
-        For Each oSearch As DocSearch In oSearches
+        If _ResultType = ResultType.Data Then
+            oSearches = Await LoadDataSearchesAsync()
+        Else
+            oSearches = Await LoadDocumentSearchesAsync()
+        End If
+
+        For Each oSearch As Search In oSearches
             RefreshTabDoc(oSearch.ProfileId, oSearch.DataTable, oSearch.TabIndex, oSearch.TabCaption)
         Next
 
         GridView1.HideLoadingPanel()
     End Sub
 
-    Private Async Function LoadSearchesAsync() As Task(Of List(Of DocSearch))
+    Private Async Function LoadDocumentSearchesAsync() As Task(Of List(Of Search))
-        Return Await Task.Run(AddressOf DoLoadSearches)
+        Return Await Task.Run(AddressOf DoLoadDocumentSearches)
     End Function
 
-    Private Function DoLoadSearches() As List(Of DocSearch)
+    Private Async Function LoadDataSearchesAsync() As Task(Of List(Of Search))
+        Return Await Task.Run(AddressOf DoLoadDataSearches)
+    End Function
+
+    Private Function DoLoadDocumentSearches() As List(Of Search)
         Dim oMatchingIds = String.Join(",", _MatchingProfiles.Select(Function(p) p.Guid).ToArray())
         Dim oSQL As String = $"SELECT * FROM TBCW_PROF_DOC_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({oMatchingIds}) ORDER BY TAB_INDEX"
         Dim oSearchesDataTable = _Database.GetDatatable(oSQL)
-        Dim oDocSearches As New List(Of DocSearch)
+        Dim oDocSearches As New List(Of Search)
         Dim oCounter As Integer = 0
         Dim oPatterns As New Patterns.ClassPatterns(_LogConfig)
 
@@ -77,7 +97,7 @@ Public Class frmDocumentResult
             oSQL = oPatterns.ReplaceInternalValues(oSQL)
 
             Dim oDatatable As DataTable = _Database.GetDatatable(oSQL, oConnectionId)
-            oDocSearches.Add(New DocSearch() With {
+            oDocSearches.Add(New Search() With {
                 .DataTable = oDatatable,
                 .ProfileId = oProfileId,
                 .TabCaption = oTabTitle,
@@ -91,6 +111,40 @@ Public Class frmDocumentResult
         Return oDocSearches
     End Function
 
+    Private Function DoLoadDataSearches() As List(Of Search)
+        Dim oMatchingIds = String.Join(",", _MatchingProfiles.Select(Function(p) p.Guid).ToArray())
+        Dim oSQL As String = $"SELECT * FROM TBCW_PROF_DATA_SEARCH WHERE ACTIVE = 1 AND PROFILE_ID in ({oMatchingIds}) ORDER BY TAB_INDEX"
+        Dim oSearchesDataTable = _Database.GetDatatable(oSQL)
+        Dim oDataSearches As New List(Of Search)
+        Dim oCounter As Integer = 0
+        Dim oPatterns As New Patterns.ClassPatterns(_LogConfig)
+
+        _DocumentSearches = oSearchesDataTable
+
+        For Each oRow As DataRow In oSearchesDataTable.Rows
+            Dim oProfileId As Integer = oRow.Item("PROFILE_ID")
+            Dim oTabTitle As String = oRow.Item("TAB_TITLE")
+            Dim oConnectionId As Integer = oRow.Item("CONN_ID")
+
+            oSQL = oRow.Item("SQL_COMMAND")
+            oSQL = oPatterns.ReplaceUserValues(oSQL, _Environment.User)
+            oSQL = oPatterns.ReplaceInternalValues(oSQL)
+
+            Dim oDatatable As DataTable = _Database.GetDatatable(oSQL, oConnectionId)
+            oDataSearches.Add(New Search() With {
+                .DataTable = oDatatable,
+                .ProfileId = oProfileId,
+                .TabCaption = oTabTitle,
+                .TabIndex = oCounter,
+                .SQLCommand = oSQL
+            })
+
+            oCounter += 1
+        Next
+
+        Return oDataSearches
+    End Function
+
     Sub RefreshTabDoc(ProfileId As Integer, Datatable As DataTable, TabIndex As Integer, TabCaption As String)
         Try
             Dim oSelectedGridControl As GridControl = GridControl1
@@ -130,9 +184,13 @@ Public Class frmDocumentResult
                 XtraTabControl.TabPages(TabIndex).Text = $"{TabCaption} ({Datatable.Rows.Count})"
                 'clsWMDocGrid.DTDocuments = Datatable
 
-                Create_GridControl(oSelectedGridView, Datatable)
+                If _ResultType = ResultType.Document Then
-                'Dim oxmlPath As String = Get_DocGrid_Layout_Filename(XtraTabControlDocs.SelectedTabPageIndex)
+                    CreateDocumentGrid(oSelectedGridView, Datatable)
+                Else
+                    CreateDataGrid(oSelectedGridView, Datatable)
+                End If
 
+                'Dim oxmlPath As String = Get_DocGrid_Layout_Filename(XtraTabControlDocs.SelectedTabPageIndex)
                 'If File.Exists(oxmlPath) Then
                 '    oSelectedGridView.RestoreLayoutFromXml(oxmlPath)
                 '    oSelectedGridView.GuessAutoFilterRowValuesFromFilter()
@@ -147,7 +205,10 @@ Public Class frmDocumentResult
         End Try
     End Sub
 
-    Private Sub Create_GridControl(MyGridView As GridView, _datatable As DataTable)
+    Private Sub CreateDataGrid(GridView As GridView, Datatable As DataTable)
+    End Sub
+
+    Private Sub CreateDocumentGrid(MyGridView As GridView, _datatable As DataTable)
         Dim oMyDocDatatable As New DataTable
         Try
             'Die Icon Colum erstellen und konfigurieren

ZooFlow/ClassInit.vb

@@ -8,12 +8,12 @@ Imports DigitalData.GUIs.ZooFlow.ClassInitLoader
 Imports DigitalData.GUIs.ZooFlow.ClassConstants
 
 Public Class ClassInit
-    Private _MainForm As frmMain
+    Private _MainForm As frmAdmin
     Private _Logger As Logger
 
     Public Event Completed As EventHandler
 
-    Public Sub New(LogConfig As LogConfig, ParentForm As frmMain)
+    Public Sub New(LogConfig As LogConfig, ParentForm As frmAdmin)
         _MainForm = ParentForm
         _Logger = LogConfig.GetLogger()
     End Sub

ZooFlow/My Project/Application.Designer.vb

@@ -32,7 +32,7 @@ Namespace My
         
         <Global.System.Diagnostics.DebuggerStepThroughAttribute()>  _
         Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.DigitalData.GUIs.ZooFlow.frmMain
+            Me.MainForm = Global.DigitalData.GUIs.ZooFlow.frmAdmin
         End Sub
     End Class
 End Namespace

ZooFlow/MyApplication.vb

@@ -26,7 +26,7 @@ Namespace My
         End Property
 
         Property LogConfig As LogConfig
-        Property MainForm As frmMain
+        Property MainForm As frmAdmin
         Property Database As MSSQLServer
         Property Queries As New ClassQueries
     End Module

ZooFlow/ZooFlow.vbproj

@@ -107,11 +107,11 @@
     <Compile Include="frmConfigDatabase.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmMain.vb">
+    <Compile Include="frmAdmin.vb">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="frmMain.Designer.vb">
+    <Compile Include="frmAdmin.Designer.vb">
-      <DependentUpon>frmMain.vb</DependentUpon>
+      <DependentUpon>frmAdmin.vb</DependentUpon>
     </Compile>
     <Compile Include="frmFlowForm.Designer.vb">
       <DependentUpon>frmFlowForm.vb</DependentUpon>
@@ -141,8 +141,8 @@
     <EmbeddedResource Include="frmConfigDatabase.resx">
       <DependentUpon>frmConfigDatabase.vb</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="frmMain.resx">
+    <EmbeddedResource Include="frmAdmin.resx">
-      <DependentUpon>frmMain.vb</DependentUpon>
+      <DependentUpon>frmAdmin.vb</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="frmFlowForm.resx">
       <DependentUpon>frmFlowForm.vb</DependentUpon>

ZooFlow/frmAdmin.Designer.vb

@@ -1,4 +1,4 @@
-Partial Public Class frmMain
+Partial Public Class frmAdmin
     Inherits DevExpress.XtraBars.Ribbon.RibbonForm
 
     ''' <summary>
@@ -24,27 +24,25 @@
     ''' the contents of this method with the code editor.
     ''' </summary>
     Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
         Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, GetType(Global.DigitalData.GUIs.ZooFlow.frmSplash), True, True)
-        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin))
         Me.ribbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
-        Me.ApplicationMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
+        Me.ApplicationMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu()
         Me.ButtonSettings = New DevExpress.XtraBars.BarButtonItem()
         Me.ButtonExit = New DevExpress.XtraBars.BarButtonItem()
         Me.SkinDropDownButtonItem1 = New DevExpress.XtraBars.SkinDropDownButtonItem()
         Me.ribbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.ribbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.NotifyIconMain = New System.Windows.Forms.NotifyIcon(Me.components)
+        Me.NotifyIconMain = New System.Windows.Forms.NotifyIcon()
-        Me.ContextMenuStripMain = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ContextMenuStripMain = New System.Windows.Forms.ContextMenuStrip()
         Me.AnzeigenVersteckenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.AdministrationToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator()
-        Me.ToolStripMenuItem1 = New System.Windows.Forms.ToolStripMenuItem()
         Me.ToolStripSeparator1 = New System.Windows.Forms.ToolStripSeparator()
         Me.BeendenToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.ToastNotificationsManager = New DevExpress.XtraBars.ToastNotifications.ToastNotificationsManager(Me.components)
+        Me.ToastNotificationsManager = New DevExpress.XtraBars.ToastNotifications.ToastNotificationsManager()
-        Me.TimerRefreshData = New System.Windows.Forms.Timer(Me.components)
+        Me.TimerRefreshData = New System.Windows.Forms.Timer()
-        Me.ImageListDebugTree = New System.Windows.Forms.ImageList(Me.components)
+        Me.ImageListDebugTree = New System.Windows.Forms.ImageList()
         CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ApplicationMenu, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.ContextMenuStripMain.SuspendLayout()
@@ -113,42 +111,38 @@
         '
         'ContextMenuStripMain
         '
-        Me.ContextMenuStripMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AnzeigenVersteckenToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator2, Me.ToolStripMenuItem1, Me.ToolStripSeparator1, Me.BeendenToolStripMenuItem})
+        Me.ContextMenuStripMain.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.AnzeigenVersteckenToolStripMenuItem, Me.AdministrationToolStripMenuItem, Me.ToolStripSeparator2, Me.ToolStripSeparator1, Me.BeendenToolStripMenuItem})
         Me.ContextMenuStripMain.Name = "ContextMenuStripMain"
-        Me.ContextMenuStripMain.Size = New System.Drawing.Size(204, 104)
+        Me.ContextMenuStripMain.Size = New System.Drawing.Size(185, 82)
         '
         'AnzeigenVersteckenToolStripMenuItem
         '
         Me.AnzeigenVersteckenToolStripMenuItem.Name = "AnzeigenVersteckenToolStripMenuItem"
-        Me.AnzeigenVersteckenToolStripMenuItem.Size = New System.Drawing.Size(203, 22)
+        Me.AnzeigenVersteckenToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
         Me.AnzeigenVersteckenToolStripMenuItem.Text = "Anzeigen/Verstecken"
         '
         'AdministrationToolStripMenuItem
         '
         Me.AdministrationToolStripMenuItem.Name = "AdministrationToolStripMenuItem"
-        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(203, 22)
+        Me.AdministrationToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
         Me.AdministrationToolStripMenuItem.Text = "Administration"
         '
         'ToolStripSeparator2
         '
         Me.ToolStripSeparator2.Name = "ToolStripSeparator2"
-        Me.ToolStripSeparator2.Size = New System.Drawing.Size(200, 6)
+        Me.ToolStripSeparator2.Size = New System.Drawing.Size(181, 6)
-        '
+        Me.ToolStripSeparator2.Tag = "MODULE_ITEM_START"
-        'ToolStripMenuItem1
-        '
-        Me.ToolStripMenuItem1.Name = "ToolStripMenuItem1"
-        Me.ToolStripMenuItem1.Size = New System.Drawing.Size(203, 22)
-        Me.ToolStripMenuItem1.Text = "Clipboard Überwachung"
         '
         'ToolStripSeparator1
         '
         Me.ToolStripSeparator1.Name = "ToolStripSeparator1"
-        Me.ToolStripSeparator1.Size = New System.Drawing.Size(200, 6)
+        Me.ToolStripSeparator1.Size = New System.Drawing.Size(181, 6)
+        Me.ToolStripSeparator1.Tag = "MODULE_ITEM_END"
         '
         'BeendenToolStripMenuItem
         '
         Me.BeendenToolStripMenuItem.Name = "BeendenToolStripMenuItem"
-        Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(203, 22)
+        Me.BeendenToolStripMenuItem.Size = New System.Drawing.Size(184, 22)
         Me.BeendenToolStripMenuItem.Text = "Beenden"
         '
         'ToastNotificationsManager
@@ -173,13 +167,13 @@
         Me.ImageListDebugTree.Images.SetKeyName(3, "WindowsForm_817.ico")
         Me.ImageListDebugTree.Images.SetKeyName(4, "process_16xMD.png")
         '
-        'frmMain
+        'frmAdmin
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(906, 587)
         Me.Controls.Add(Me.ribbonControl1)
-        Me.Name = "frmMain"
+        Me.Name = "frmAdmin"
         Me.Ribbon = Me.ribbonControl1
         Me.Text = "Zoo Flow"
         CType(Me.ribbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -200,7 +194,6 @@
     Friend WithEvents ContextMenuStripMain As ContextMenuStrip
     Friend WithEvents AdministrationToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents ToolStripSeparator2 As ToolStripSeparator
-    Friend WithEvents ToolStripMenuItem1 As ToolStripMenuItem
     Friend WithEvents ToolStripSeparator1 As ToolStripSeparator
     Friend WithEvents BeendenToolStripMenuItem As ToolStripMenuItem
     Friend WithEvents AnzeigenVersteckenToolStripMenuItem As ToolStripMenuItem

ZooFlow/frmAdmin.resx

@@ -380,7 +380,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABU
-        CwAAAk1TRnQBSQFMAgEBBQEAATgBAAE4AQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CwAAAk1TRnQBSQFMAgEBBQEAAVgBAAFYAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

ZooFlow/frmAdmin.vb

@@ -9,7 +9,7 @@ Imports DigitalData.Modules.ZooFlow.Params
 Imports DigitalData.GUIs.ZooFlow.OnFlowFormStateChangedEvent.FlowFormState
 Imports DigitalData.Modules.ClipboardWatcher
 
-Partial Public Class frmMain
+Partial Public Class frmAdmin
     Private WithEvents FlowForm As frmFlowForm
 
     Private Init As ClassInit
@@ -35,8 +35,6 @@ Partial Public Class frmMain
         EventBus.Instance.Register(Me)
     End Sub
 
-
-
     Private Sub frmMain_FormClosed(sender As Object, e As FormClosedEventArgs)
         EventBus.Instance.Unregister(Me)
     End Sub
@@ -73,6 +71,16 @@ Partial Public Class frmMain
         FlowForm = New frmFlowForm(My.Application.ModulesActive)
         FlowForm.Show()
 
+        Dim oModuleItemsIndex = 0
+        ' === Setup Notification Icon
+        For Each oItem As ToolStripItem In ContextMenuStripMain.Items
+            If oItem.Tag IsNot Nothing AndAlso oItem.Tag.ToString = "MODULE_ITEM_START" Then
+                oModuleItemsIndex = ContextMenuStripMain.Items.IndexOf(oItem)
+                Exit For
+            End If
+        Next
+        ContextMenuStripMain.Items.Insert(oModuleItemsIndex + 1, New ToolStripMenuItem("Test"))
+
         ' === Load Data ===
         RefreshData()
     End Sub
@@ -163,10 +171,6 @@ Partial Public Class frmMain
         frmSettings.ShowDialog()
     End Sub
 
-    Private Sub ButtonExit_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles ButtonExit.ItemClick
-
-    End Sub
-
     Private Sub frmMain_StyleChanged(sender As Object, e As EventArgs) Handles Me.StyleChanged
         If Loading = False Then
             My.UIConfig.SkinName = LookAndFeel.ActiveSkinName
@@ -196,6 +200,4 @@ Partial Public Class frmMain
             Logger.Error(ex)
         End Try
     End Sub
-
-
 End Class