Add Checkbox and DateTime Editor for frmEdit, New LookupGrid WIP

2019-02-28 17:33:47 +01:00
parent 667b8f1b2f
commit cfbcd8a8f2
22 changed files with 574 additions and 74 deletions
--- a/EDMI_ClientSuite/ClassControlPatcher.vb
+++ b/EDMI_ClientSuite/ClassControlPatcher.vb
@@ -17,19 +17,19 @@ Public Class ClassControlPatcher(Of T As Control)
        _Container = Container
    End Sub

-    Public Function ProcessContainer(Action As Action(Of T)) As ClassControlPatcher(Of T)
+    Public Function ProcessContainer(Action As Action(Of T, Control)) As ClassControlPatcher(Of T)
        Return ProcessContainer(_Container, Action)
    End Function

-    Public Function ProcessControl(Action As Action(Of T), ByVal Control As Control) As ClassControlPatcher(Of T)
-        Action(Control)
+    Public Function ProcessControl(Action As Action(Of T, Control), ByVal Control As Control) As ClassControlPatcher(Of T)
+        Action(Control, _Container)
        Return Me
    End Function
-    Private Function ProcessContainer(ByVal Container As Control, Action As Action(Of T)) As ClassControlPatcher(Of T)
+    Private Function ProcessContainer(ByVal Container As Control, Action As Action(Of T, Control)) As ClassControlPatcher(Of T)
        For Each oControl As Control In Container.Controls

            If oControl.[GetType]() = GetType(T) Then
-                Action(oControl)
+                Action(oControl, Container)
            Else
                ProcessContainer(oControl, Action)
            End If
--- a/EDMI_ClientSuite/ControlDefaults/ClassGridControl.vb
+++ b/EDMI_ClientSuite/ControlDefaults/ClassGridControl.vb
@@ -2,7 +2,7 @@
 Imports DevExpress.XtraGrid.Views.Grid

 Public Class ClassGridControl
-    Public Shared Sub DefaultGridSettings(grid As GridControl)
+    Public Shared Sub DefaultGridSettings(grid As GridControl, Container As Control)
        For Each oView In grid.Views
            If TypeOf oView Is GridView Then
                DefaultGridViewSettings(oView)
@@ -10,15 +10,15 @@ Public Class ClassGridControl
        Next
    End Sub

-    Public Shared Sub ReadOnlyGridSettings(grid As GridControl)
+    Public Shared Sub ReadOnlyGridSettings(grid As GridControl, Container As Control)
        For Each oView In grid.Views
            If TypeOf oView Is GridView Then
-                ReadonlyGridViewSettings(oView)
+                ReadonlyGridViewSettings(oView, Container)
            End If
        Next
    End Sub

-    Public Shared Sub CheckboxSelectGridSettings(grid As GridControl)
+    Public Shared Sub CheckboxSelectGridSettings(grid As GridControl, Container As Control)
        For Each oView In grid.Views
            If TypeOf oView Is GridView Then
                CheckboxSelectGridViewSettings(oView)
@@ -29,7 +29,7 @@ Public Class ClassGridControl
    ''' <summary>
    ''' Set a view to readonly
    ''' </summary>
-    Private Shared Sub ReadonlyGridViewSettings(ByRef View As GridView)
+    Private Shared Sub ReadonlyGridViewSettings(ByRef View As GridView, Container As Control)
        View.OptionsBehavior.Editable = False
        View.OptionsBehavior.ReadOnly = True
    End Sub
@@ -54,6 +54,11 @@ Public Class ClassGridControl
        View.Appearance.FilterPanel.BackColor = Color.Orange

        AddHandler View.RowStyle, AddressOf GridView_RowStyle
+        'AddHandler View.Layout, AddressOf GridView_Layout
+    End Sub
+
+    Private Shared Sub GridView_Layout(sender As Object, e As EventArgs)
+        'Throw New NotImplementedException()
    End Sub

    Private Shared Sub GridView_RowStyle(sender As Object, e As RowStyleEventArgs)
--- a/EDMI_ClientSuite/UserManager/UserControlAssignment.vb
+++ b/EDMI_ClientSuite/UserManager/UserControlAssignment.vb
@@ -182,6 +182,11 @@ Public Class UserControlAssignment
                                Where oRow.Item(_ParentIdColumn) = _ParentRecordId
                                Select oRow.Item(_ChildIdColumn)

+        If _ChildList Is Nothing Then
+            Exit Sub
+        End If
+
+
        Dim oAssignedChildren As EnumerableRowCollection(Of DataRow) = From oRow In _ChildList.AsEnumerable()
                                                                       Where oAssignedChildIds.Contains(oRow.Item(ClassConstants.ATTRIBUTE_ID_COLUMN))

--- a/EDMI_ClientSuite/frmEdit.Designer.vb
+++ b/EDMI_ClientSuite/frmEdit.Designer.vb
@@ -22,7 +22,6 @@ Partial Class frmEdit
    'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEdit))
        Me.SplitContainer = New DevExpress.XtraEditors.SplitContainerControl()
        Me.GridList = New DevExpress.XtraGrid.GridControl()
@@ -54,13 +53,13 @@ Partial Class frmEdit
        'SplitContainer
        '
        Me.SplitContainer.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainer.Location = New System.Drawing.Point(0, 146)
+        Me.SplitContainer.Location = New System.Drawing.Point(0, 143)
        Me.SplitContainer.Name = "SplitContainer"
        Me.SplitContainer.Panel1.Controls.Add(Me.GridList)
        Me.SplitContainer.Panel1.Text = "Panel1"
        Me.SplitContainer.Panel2.Controls.Add(Me.LayoutControl1)
        Me.SplitContainer.Panel2.Text = "Panel2"
-        Me.SplitContainer.Size = New System.Drawing.Size(1104, 338)
+        Me.SplitContainer.Size = New System.Drawing.Size(1104, 331)
        Me.SplitContainer.SplitterPosition = 547
        Me.SplitContainer.TabIndex = 0
        Me.SplitContainer.Text = "SplitContainerControl1"
@@ -71,7 +70,7 @@ Partial Class frmEdit
        Me.GridList.Location = New System.Drawing.Point(0, 0)
        Me.GridList.MainView = Me.ViewList
        Me.GridList.Name = "GridList"
-        Me.GridList.Size = New System.Drawing.Size(547, 338)
+        Me.GridList.Size = New System.Drawing.Size(547, 331)
        Me.GridList.TabIndex = 0
        Me.GridList.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewList})
        '
@@ -87,7 +86,7 @@ Partial Class frmEdit
        Me.LayoutControl1.Name = "LayoutControl1"
        Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(-870, 211, 650, 400)
        Me.LayoutControl1.Root = Me.LayoutGroup
-        Me.LayoutControl1.Size = New System.Drawing.Size(545, 338)
+        Me.LayoutControl1.Size = New System.Drawing.Size(552, 331)
        Me.LayoutControl1.TabIndex = 0
        Me.LayoutControl1.Text = "LayoutControl1"
        '
@@ -96,7 +95,7 @@ Partial Class frmEdit
        Me.LayoutGroup.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.LayoutGroup.GroupBordersVisible = False
        Me.LayoutGroup.Name = "Root"
-        Me.LayoutGroup.Size = New System.Drawing.Size(545, 338)
+        Me.LayoutGroup.Size = New System.Drawing.Size(552, 331)
        Me.LayoutGroup.TextVisible = False
        '
        'RibbonControl1
@@ -108,7 +107,7 @@ Partial Class frmEdit
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
-        Me.RibbonControl1.Size = New System.Drawing.Size(1104, 146)
+        Me.RibbonControl1.Size = New System.Drawing.Size(1104, 143)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
        'BarButtonSave
@@ -189,10 +188,10 @@ Partial Class frmEdit
        '
        Me.RibbonStatusBar1.ItemLinks.Add(Me.labelParentAttributeId)
        Me.RibbonStatusBar1.ItemLinks.Add(Me.labelSyskey)
-        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 484)
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 474)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1104, 21)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1104, 31)
        '
        'RibbonPage2
        '
--- a/EDMI_ClientSuite/frmEdit.vb
+++ b/EDMI_ClientSuite/frmEdit.vb
@@ -30,6 +30,10 @@ Public Class frmEdit
        _BindingSource = New BindingSource With {
            .DataSource = _Datatable
        }
+
+        If _Datatable Is Nothing Then
+            _ErrorHandler.ShowErrorMessage(New ArgumentNullException("Datatable is empty"))
+        End If
    End Sub

    Private Async Sub frmEdit_Load(sender As Object, e As EventArgs) Handles MyBase.Load
@@ -120,25 +124,41 @@ Public Class frmEdit
                oIntegerEdit.Properties.Mask.MaskType = Mask.MaskType.Numeric
                oIntegerEdit.Properties.Mask.EditMask = "n"
                oEditor = oIntegerEdit
+            Case GetType(DateTime)
+                Dim oDateEdit As New DateEdit() With {
+                    .Name = Column.ColumnName
+                }
+
+                oEditor = oDateEdit
+            Case GetType(Boolean)
+                Dim oCheckEdit = New CheckEdit() With {
+                    .Name = Column.ColumnName
+                }
+
+                oCheckEdit.Properties.Caption = Column.ColumnName
+
+                oEditor = oCheckEdit
            Case Else
-                oEditor = New TextEdit() With {.Name = Column.ColumnName}
+                oEditor = New TextEdit() With {
+                    .Name = Column.ColumnName
+                }
        End Select

+
+        Dim oMetadata As New ControlMetadata() With {
+            .DataType = Column.DataType,
+            .ColumnName = Column.ColumnName
+        }
+
        ' Set EditControl Metadata
-        If AttributeId > 0 Then
-            oEditor.Tag = New ControlMetadata() With {
-                .AttributeId = AttributeId,
-                .DataType = Column.DataType,
-                .ColumnName = Column.ColumnName
-            }
+        If AttributeId = 0 Then
+            oMetadata.AttributeId = Nothing
        Else
-            oEditor.Tag = New ControlMetadata() With {
-                .AttributeId = Nothing,
-                .DataType = Column.DataType,
-                .ColumnName = Column.ColumnName
-            }
+            oMetadata.AttributeId = AttributeId
        End If

+        oEditor.Tag = oMetadata
+
        Return oEditor
    End Function

@@ -173,7 +193,13 @@ Public Class frmEdit
            Dim oAttributeId As Integer = GetRowItemBySequence(oCounter, "ATTRIBUTE_ID")
            Dim oCaption = GetColumnCaption(oColumn, oCounter)
            Dim oEditor = GetColumnEditor(oColumn, oAttributeId)
-            oEditor.DataBindings.Add(New Binding("Text", _BindingSource, oColumn.ColumnName))
+
+            ' Setup Databinding for editor
+            If oColumn.DataType = GetType(Boolean) Then
+                oEditor.DataBindings.Add(New Binding("Checked", _BindingSource, oColumn.ColumnName))
+            Else
+                oEditor.DataBindings.Add(New Binding("Text", _BindingSource, oColumn.ColumnName))
+            End If

            ' Add Control to Layout
            LayoutGroup.AddItem(oCaption, oEditor)
@@ -227,4 +253,8 @@ Public Class frmEdit
        _LayoutConfig = oDefaultLayout
        ApplyLayout()
    End Sub
+
+    Private Sub ViewList_Layout(sender As Object, e As EventArgs) Handles ViewList.Layout
+
+    End Sub
 End Class
--- a/EDMI_ClientSuite/frmMain.Designer.vb
+++ b/EDMI_ClientSuite/frmMain.Designer.vb
@@ -19,11 +19,10 @@ Partial Class frmMain
    'Do not modify it using the code editor.
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain))
        Dim PushTransition1 As DevExpress.Utils.Animation.PushTransition = New DevExpress.Utils.Animation.PushTransition()
        Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl()
-        Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components)
+        Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu()
        Me.BarButtonExit = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonUserSettings = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonConnectionSettings = New DevExpress.XtraBars.BarButtonItem()
@@ -42,6 +41,7 @@ Partial Class frmMain
        Me.WorkspaceManager1 = New DevExpress.Utils.WorkspaceManager()
        Me.LabelServiceOnline = New DevExpress.XtraBars.BarStaticItem()
        Me.BarButtonUserManager = New DevExpress.XtraBars.BarButtonItem()
+        Me.LabelServiceOffline = New DevExpress.XtraBars.BarStaticItem()
        Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -52,9 +52,9 @@ Partial Class frmMain
        Me.RibbonPageAdmin = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
-        Me.DocumentManager = New DevExpress.XtraBars.Docking2010.DocumentManager(Me.components)
-        Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(Me.components)
-        Me.DockManager = New DevExpress.XtraBars.Docking.DockManager(Me.components)
+        Me.DocumentManager = New DevExpress.XtraBars.Docking2010.DocumentManager()
+        Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView()
+        Me.DockManager = New DevExpress.XtraBars.Docking.DockManager()
        Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel()
        Me.DockPanelGlobix = New DevExpress.XtraBars.Docking.DockPanel()
        Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer()
@@ -78,15 +78,15 @@ Partial Class frmMain
        '
        Me.RibbonControl.ApplicationButtonDropDownControl = Me.MainMenu
        Me.RibbonControl.ExpandCollapseItem.Id = 0
-        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.BarButtonDock1, Me.SkinDropDownButtonItem1, Me.BarButtonDashboard, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings, Me.LabelCurrentLanguage, Me.BarButtonItem2, Me.BarWorkspaceMenuItem1, Me.LabelServiceOnline, Me.BarButtonUserManager})
+        Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.BarButtonDock1, Me.SkinDropDownButtonItem1, Me.BarButtonDashboard, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings, Me.LabelCurrentLanguage, Me.BarButtonItem2, Me.BarWorkspaceMenuItem1, Me.LabelServiceOnline, Me.BarButtonUserManager, Me.LabelServiceOffline})
        Me.RibbonControl.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl.MaxItemId = 20
+        Me.RibbonControl.MaxItemId = 21
        Me.RibbonControl.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always
        Me.RibbonControl.Name = "RibbonControl"
        Me.RibbonControl.PageHeaderItemLinks.Add(Me.SkinDropDownButtonItem1)
        Me.RibbonControl.PageHeaderItemLinks.Add(Me.BarWorkspaceMenuItem1)
        Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageView, Me.RibbonPageWorkflow, Me.RibbonPageAdmin})
-        Me.RibbonControl.Size = New System.Drawing.Size(1139, 146)
+        Me.RibbonControl.Size = New System.Drawing.Size(1139, 143)
        Me.RibbonControl.StatusBar = Me.RibbonStatusBar
        '
        'MainMenu
@@ -124,12 +124,14 @@ Partial Class frmMain
        '
        Me.LabelCurrentUser.Caption = "Current User"
        Me.LabelCurrentUser.Id = 3
+        Me.LabelCurrentUser.ImageOptions.Image = CType(resources.GetObject("LabelCurrentUser.ImageOptions.Image"), System.Drawing.Image)
        Me.LabelCurrentUser.Name = "LabelCurrentUser"
        '
        'LabelCurrentMachine
        '
        Me.LabelCurrentMachine.Caption = "Current Machine"
        Me.LabelCurrentMachine.Id = 4
+        Me.LabelCurrentMachine.ImageOptions.Image = CType(resources.GetObject("LabelCurrentMachine.ImageOptions.Image"), System.Drawing.Image)
        Me.LabelCurrentMachine.Name = "LabelCurrentMachine"
        '
        'LabelCurrentVersion
@@ -137,6 +139,8 @@ Partial Class frmMain
        Me.LabelCurrentVersion.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
        Me.LabelCurrentVersion.Caption = "Current Version"
        Me.LabelCurrentVersion.Id = 5
+        Me.LabelCurrentVersion.ImageOptions.Image = CType(resources.GetObject("LabelCurrentVersion.ImageOptions.Image"), System.Drawing.Image)
+        Me.LabelCurrentVersion.ImageOptions.LargeImage = CType(resources.GetObject("LabelCurrentVersion.ImageOptions.LargeImage"), System.Drawing.Image)
        Me.LabelCurrentVersion.Name = "LabelCurrentVersion"
        '
        'BarButtonItem1
@@ -184,6 +188,7 @@ Partial Class frmMain
        '
        Me.LabelCurrentLanguage.Caption = "CurrentLanguage"
        Me.LabelCurrentLanguage.Id = 15
+        Me.LabelCurrentLanguage.ImageOptions.Image = CType(resources.GetObject("LabelCurrentLanguage.ImageOptions.Image"), System.Drawing.Image)
        Me.LabelCurrentLanguage.Name = "LabelCurrentLanguage"
        '
        'BarButtonItem2
@@ -206,8 +211,9 @@ Partial Class frmMain
        '
        'LabelServiceOnline
        '
-        Me.LabelServiceOnline.Caption = "BarStaticItem1"
+        Me.LabelServiceOnline.Caption = "Service Online"
        Me.LabelServiceOnline.Id = 18
+        Me.LabelServiceOnline.ImageOptions.Image = CType(resources.GetObject("LabelServiceOnline.ImageOptions.Image"), System.Drawing.Image)
        Me.LabelServiceOnline.Name = "LabelServiceOnline"
        '
        'BarButtonUserManager
@@ -218,6 +224,13 @@ Partial Class frmMain
        Me.BarButtonUserManager.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonUserManager.ImageOptions.LargeImage"), System.Drawing.Image)
        Me.BarButtonUserManager.Name = "BarButtonUserManager"
        '
+        'LabelServiceOffline
+        '
+        Me.LabelServiceOffline.Caption = "Service Offline"
+        Me.LabelServiceOffline.Id = 20
+        Me.LabelServiceOffline.ImageOptions.Image = CType(resources.GetObject("LabelServiceOffline.ImageOptions.Image"), System.Drawing.Image)
+        Me.LabelServiceOffline.Name = "LabelServiceOffline"
+        '
        'RibbonPageStart
        '
        Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3})
@@ -280,10 +293,11 @@ Partial Class frmMain
        Me.RibbonStatusBar.ItemLinks.Add(Me.LabelCurrentVersion)
        Me.RibbonStatusBar.ItemLinks.Add(Me.LabelCurrentLanguage)
        Me.RibbonStatusBar.ItemLinks.Add(Me.LabelServiceOnline)
-        Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 556)
+        Me.RibbonStatusBar.ItemLinks.Add(Me.LabelServiceOffline)
+        Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 546)
        Me.RibbonStatusBar.Name = "RibbonStatusBar"
        Me.RibbonStatusBar.Ribbon = Me.RibbonControl
-        Me.RibbonStatusBar.Size = New System.Drawing.Size(1139, 21)
+        Me.RibbonStatusBar.Size = New System.Drawing.Size(1139, 31)
        '
        'DocumentManager
        '
@@ -308,11 +322,11 @@ Partial Class frmMain
        Me.panelContainer1.Controls.Add(Me.DockPanelProcessManager)
        Me.panelContainer1.Dock = DevExpress.XtraBars.Docking.DockingStyle.Right
        Me.panelContainer1.ID = New System.Guid("a0849884-28cd-486b-bc02-0c28fd88a006")
-        Me.panelContainer1.Location = New System.Drawing.Point(793, 146)
+        Me.panelContainer1.Location = New System.Drawing.Point(793, 143)
        Me.panelContainer1.Name = "panelContainer1"
        Me.panelContainer1.OriginalSize = New System.Drawing.Size(346, 200)
        Me.panelContainer1.SavedSizeFactor = 0R
-        Me.panelContainer1.Size = New System.Drawing.Size(346, 410)
+        Me.panelContainer1.Size = New System.Drawing.Size(346, 403)
        Me.panelContainer1.Text = "panelContainer1"
        '
        'DockPanelGlobix
@@ -323,17 +337,17 @@ Partial Class frmMain
        Me.DockPanelGlobix.Location = New System.Drawing.Point(0, 0)
        Me.DockPanelGlobix.Name = "DockPanelGlobix"
        Me.DockPanelGlobix.Options.ShowCloseButton = False
-        Me.DockPanelGlobix.OriginalSize = New System.Drawing.Size(200, 200)
+        Me.DockPanelGlobix.OriginalSize = New System.Drawing.Size(346, 205)
        Me.DockPanelGlobix.SavedSizeFactor = 0R
-        Me.DockPanelGlobix.Size = New System.Drawing.Size(346, 205)
+        Me.DockPanelGlobix.Size = New System.Drawing.Size(346, 202)
        Me.DockPanelGlobix.Text = "GLOBIX"
        '
        'DockPanel1_Container
        '
        Me.DockPanel1_Container.Controls.Add(Me.Label1)
-        Me.DockPanel1_Container.Location = New System.Drawing.Point(5, 38)
+        Me.DockPanel1_Container.Location = New System.Drawing.Point(5, 23)
        Me.DockPanel1_Container.Name = "DockPanel1_Container"
-        Me.DockPanel1_Container.Size = New System.Drawing.Size(337, 162)
+        Me.DockPanel1_Container.Size = New System.Drawing.Size(337, 174)
        Me.DockPanel1_Container.TabIndex = 0
        '
        'Label1
@@ -342,7 +356,7 @@ Partial Class frmMain
        Me.Label1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.Label1.Location = New System.Drawing.Point(0, 0)
        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(337, 162)
+        Me.Label1.Size = New System.Drawing.Size(337, 174)
        Me.Label1.TabIndex = 0
        Me.Label1.Text = "DROP FILES HERE"
        Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
@@ -352,20 +366,20 @@ Partial Class frmMain
        Me.DockPanelProcessManager.Controls.Add(Me.DockPanel2_Container)
        Me.DockPanelProcessManager.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
        Me.DockPanelProcessManager.ID = New System.Guid("a84f02de-66af-4674-9260-85bec9f0825b")
-        Me.DockPanelProcessManager.Location = New System.Drawing.Point(0, 205)
+        Me.DockPanelProcessManager.Location = New System.Drawing.Point(0, 202)
        Me.DockPanelProcessManager.Name = "DockPanelProcessManager"
        Me.DockPanelProcessManager.Options.ShowCloseButton = False
-        Me.DockPanelProcessManager.OriginalSize = New System.Drawing.Size(346, 200)
+        Me.DockPanelProcessManager.OriginalSize = New System.Drawing.Size(346, 205)
        Me.DockPanelProcessManager.SavedSizeFactor = 0R
-        Me.DockPanelProcessManager.Size = New System.Drawing.Size(346, 205)
+        Me.DockPanelProcessManager.Size = New System.Drawing.Size(346, 201)
        Me.DockPanelProcessManager.Text = "Process Manager"
        '
        'DockPanel2_Container
        '
        Me.DockPanel2_Container.Controls.Add(Me.ProcessManagerWidget)
-        Me.DockPanel2_Container.Location = New System.Drawing.Point(5, 38)
+        Me.DockPanel2_Container.Location = New System.Drawing.Point(5, 23)
        Me.DockPanel2_Container.Name = "DockPanel2_Container"
-        Me.DockPanel2_Container.Size = New System.Drawing.Size(337, 163)
+        Me.DockPanel2_Container.Size = New System.Drawing.Size(337, 174)
        Me.DockPanel2_Container.TabIndex = 0
        '
        'ProcessManagerWidget
@@ -374,7 +388,7 @@ Partial Class frmMain
        Me.ProcessManagerWidget.Dock = System.Windows.Forms.DockStyle.Fill
        Me.ProcessManagerWidget.Location = New System.Drawing.Point(0, 0)
        Me.ProcessManagerWidget.Name = "ProcessManagerWidget"
-        Me.ProcessManagerWidget.Size = New System.Drawing.Size(337, 163)
+        Me.ProcessManagerWidget.Size = New System.Drawing.Size(337, 174)
        Me.ProcessManagerWidget.TabIndex = 0
        '
        'frmMain
@@ -446,4 +460,5 @@ Partial Class frmMain
    Friend WithEvents BarButtonUserManager As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageAdmin As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents LabelServiceOffline As DevExpress.XtraBars.BarStaticItem
 End Class
--- a/EDMI_ClientSuite/frmMain.resx
+++ b/EDMI_ClientSuite/frmMain.resx
@@ -187,6 +187,59 @@
        UgOUWsM43AyRGqDEGqa++dLn1ABd1/BY5qnbDos7khqgyxoeyXhVeA3nxddw1QPX5C8cUgPk/Bu2DofU
        AG03YIyuMvdCa5bC0ZhwkGGbNcwKB3QmHGQK665hVjiQZcIB04pdcSBYxdQaYlaHxMF13YQDWSY8B5k1
        w9YKB7TGLAeZxaH/hgNaY5aDzJoDrBUOIYTBL0gqUmOSnmecAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="LabelCurrentUser.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAydEVYdFRpdGxlAEN1c3RvbWVyO0VtcGxveWVlO1Bl
+        cnNvbjtDb250YWN0O1VzZXI7Q2xpZW50fhE26AAAAfhJREFUWEfF1rFLVWEYx3FBFweHwGhVamnIvdUQ
+        CmwI+mOiIUIXwV10cQ8aGoVcbFWCiIYgAiVHsWgwSDj+fofzHN7nvV+vDt7r8Fne87zP99x7HZxomuZW
+        DRw8X9m5jmV5J7/kf+dY3ssLoTtJ9FLcaLiyIc0VtoXu9qKX4kbDhadCQfJSaEcreiluNFzw104x8kFo
+        Ryt6KW40XPguFCM/hHa0opfiRsOFv0Ix8ltoRyt6KW40XKDQZf4J7WhFL8WNhjuLQqFhfId29b0UNxru
+        bApFhvEd2tX3UtxouLMmFBnGd2hX30txo+HOfTkRChHP+g7t6nspbjRceCMUI6+EdrSil+JGw4VHQjHi
+        WdrRil6KGw1XPgoFS7tCd3vRS3Gj4cqCnAmFzc88Q3d70Utxo2HwTE6ljv8RP6M7SfRS3Gj4Enfltfgn
+        +SRv5Z7Q7IDopbjRcGUSzmpTcJZEL8WNhguP5bM8KM5q/uv/Ip6l563opbjB8JysyDeJ33pPpqWenZED
+        iTnfWZV5SbPRS3Erhu7Ilvj/vVhY2pcn4q/bluSr0Kx3eJd3XusFHspPoWW18w49q3mnd/e9FDc9nJVD
+        oQU3wbtno0cvsF4Mj8p69OgFRvnpw2H06AXowo2LHr3AUT08AkfRG3iBccPDccLDccLD8WkmLgAKdExB
+        J+0x6AAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="LabelCurrentMachine.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAsdEVYdFRpdGxlAERvY3VtZW50O01hcDtTY2hlbWU7
+        RGlhZ3JhbTtIaWVyYXI7TmV0Tg8qRAAAAMNJREFUWEft0rENwjAQBdAsyDoMwBKMQOuS7Q4cYQlFT4cj
+        Badx8VL8hP+vYImIUzEciaFcbs/YgR3CUDCSYYcwFIxk2CEMBSMZdghDwUiGHcJQMJJhhzAUjGTYIQwF
+        Ixl2CEPBSIYdwlAwkmGHMBSMZNghDKWWbpVS4o3v1CEMRSNDD5B2gN71YvgpPhq3GLYfdNj1nbYYth90
+        +O8BevftiO/Wx/Vxj1/qP1v5Vm9f/a6aB8wD5gHzgPVxJoYjMRwnlhd3GhRitUujhAAAAABJRU5ErkJg
+        gg==
+</value>
+  </data>
+  <data name="LabelCurrentVersion.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJXRFWHRUaXRsZQBCdWlsZDtT
+        ZXR0aW5ncztDdXN0b21pejtPcHRpb25zWQmgmAAAAL5JREFUOE+9kUEKAjEMRQe6mGPMGeo9BO/hzsUc
+        QLv3OOMBXM9RXBcU4/+QwQZmmuLCwCMk5P+mbScihpSSOJh5UxAObcV/DIAXZt4Uj/tJSpZY6bcZbFFq
+        WgxeYAb9QqnxDNjr9udbOFymHXLWHFoMeDLFAkZwBG/NrCGpG8wYCjr8pKCA9egZ9LouT6ToCgbNrNmP
+        VQMMZMC1KRjQ45Vowpr97BlE8PMG7huAYAzWUEHbL9SAgNfhm8RvX7oP7LDQAsI0/DoAAAAASUVORK5C
+        YII=
+</value>
+  </data>
+  <data name="LabelCurrentVersion.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJXRFWHRUaXRsZQBCdWlsZDtT
+        ZXR0aW5ncztDdXN0b21pejtPcHRpb25zWQmgmAAAActJREFUWEfNlT1Ow0AUhHODtFGUNk2aKAehzEWQ
+        qCMhV3RcgxNwACqq0NJHiAZFNBEIscxE+5yXl4nwD5ZZ6VPWs29ndu21M0gp9YoUI0VRpAZwnvTzSFFQ
+        u1UJJ1L0uB3VJnoppOjJRrVbXoT09Egx0Li1XkDeRSuiZ0SKRjZo3FovAPxFU74lUiRvD5fpHN9fO5Qc
+        Gq9VnYEmM4gUiTIyPl4fUXJovFZ1BprMIFIkysh4f7rdh3Ln/OW1qjOit0eKRBk1JXp7pEiUUVOit0eK
+        RBk1JXp7pEiUUUWewdCj/A0pEkxU5ooXsHGsL67vp2CbmSp/Q4oERioswvABQkZgjP4SXKE/BykzN0/W
+        gJHPKTuRHPAbGxrmoDuwABNwAz4z7FPjGGtYWy7iJNgQYQougLsy4yqwdmw5J8GGCFPwmS9hyN2pMMXC
+        5xyFekKQgqd9DfjMeYstgHdlBWYZ9qnZ+MTnHIV6XNA5hjDjaeeB43O2gBXGOL+EmhtnLefs3w4ZTjBR
+        hXq4AL5mNOVhs4AZxuICeCds3Gq3zJHhBBNVqOdfLKDXR9D7ISTdvYZVgWE3H6KqwKybT3EdaAjKXaHf
+        /s+oDQip+HecBj/ZKKh8xQJ6+wAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="BarButtonDashboard.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -260,11 +313,55 @@
        5cVUmRFSZEhAVG4sI1RmhBQRoojedqV1j5AiAnrL+czDT1Rlt0gR5t5yuzM8QoowZsqNoRFShIlE5Sfg
        iz3pEVKEYaTcSI1YCbi4B2/V6AN6yg014h10/5Bcg69qzJZbhh9xBjdtD1kJBJcJR3B1qpy4HI5ghiwn
        UrQgwP9Df+6iycr/ls9EijOR4kykOBMpzqPsfgDZ5w1jF/MagwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="LabelCurrentLanguage.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAtdEVYdFRpdGxlAEZvbnQ7Q29sb3I7Q2hhbmdlO0Jh
+        cnM7UmliYm9uO1N0YW5kYXJkO1GA2IIAAAJ2SURBVFhHxdY9jExRGMbx9ZUIovCxEaWKhFWshuiUstEL
+        IrG+ClEICh2j8hG6rfUsjSAShU5CshGFaCQ0hI74Nv7PzXkn75z7ZMwqRvHL7rznnPc5c3PP3DvW7Xb/
+        K1scJVscJVscJVscJVuUqfP3BtmDbvIJK+Hm9rgcWxTXILmNvAE5Cje3x+XYorgGxVp8Q72BJ3Dze1yO
+        LYprUJxEhD5O/8sE3JqGy7FFcQ2KZ4jAI3ibPl+HW9NwObYorgG2IsJ+YhzXUu0jlsKttTm2KK4BriLC
+        Hpba9lSTvajXNVyOLYppsATvEEGHofoCvC41iY21uBxbFNMgn/0fWIMYu4QY+40NyGsbLscWxTS4hQi5
+        X2phG2JMOsjjjTqj0+lMtoqhWlyf/UOo57xCjOtkLEbfnNxf4egPzarFJxDNv2MV6jkXEXNkN/rmRO8I
+        n88G8tm/W2o1/QjlDcyib4765vBhN1A3HpZu1HXIvbSBXviwG7gCFzCMs4jg+Ob7IlxsuJSFupHy2Z+v
+        l2hd9vzZhosWYqo0CqcRY85CvMFnPMccWpe9aK6EDRctxE1E+C+sRw50NkHPg2XYjIlzncs7qvAGYwN/
+        iFYjn/0HqMOcLbiDL4ir8GH6wo2D1QYmqQ/cQD77sh91WE2/iLr8x5Gfigcwp9AcLjZcGHyKCNc73wpE
+        Q0eB76GXlBmcwUboHljEX/VYrs+ZDZd64hAeIV8x0X1zDDpN+l3QE7VvnQ136oWVadThQS8ueo+wj2kb
+        5rjFxS4oxIUHPaJ3orXehjluMXRj/i1c46fg1v/zBvQ01CWNEH3D8BW6GV9A74v5xaXFho1Od+wP/kd2
+        dhb/KMUAAAAASUVORK5CYII=
 </value>
  </data>
  <metadata name="WorkspaceManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>412, 17</value>
  </metadata>
+  <data name="LabelServiceOnline.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAhdEVYdFRpdGxlAEFwcGx5O09LO0NoZWNrO0JhcnM7
+        UmliYm9uO2RjyGgAAAFKSURBVFhHxdAxTgNBEARA2wEpiH9hJETCI0j5Ck8gxI+AABAPgoCj27q1eoa+
+        27XkW4KS3KOd65FXwzD8KzvsyQ57ssOe7LCnEB6eHhch399oH4WQF09l/PYVvMKFdh5+UFlYAMu/YIAP
+        OBzR4wAtL/hPrHsc4MqZr0vnkgdUy2mpA5rKKQQ8OIXmcgoBj9Q65RZHlVMIeFjcwzOcyazm6HIKAY+J
+        5T/AD+yg5YjJcggdWQh4fAelvKgdMVtO2pGFgMfn8A76MZo6olpO2pGFMC60HtFUTtqRhSBLtSOay0k7
+        shDS4tQRL9BcTtqRhWCWp45QLN+C29/TjiwEtwxzR1TLSTuyENzyiEd8gpZ/ww2494F2ZCG4ZXEJ5QiW
+        34J794d2ZCG45YRHvEFzOWlHFoJbNjZmNks7MjvsyQ57ssOe7LAnO+xnWP0CbFjkt+hdVzwAAAAASUVO
+        RK5CYII=
+</value>
+  </data>
+  <data name="LabelServiceOffline.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAENhbmNlbDtTdG9wO0V4aXQ7QmFy
+        cztSaWJib247TJaWsgAAAW5JREFUWEfFlk1KBDEUhGfmAg56JTcuHEGP4FFFFMVZz1VcxaomD57pek1e
+        hLj4FilSP9Dd0LtSyr8ixZlIcSZSnIkUL8+3f6LJOvhzixRr0BV4AXf13I3LuQev4OjzPVKEgeUfoIBv
+        kBpRM1hOLzM+gRyxEnDxALiaRiM7wpcbzNy3fb8OBi4+gTagd4Qq5/lBda0EgsvksRrboK0RqXIiRRiM
+        zIh0OZEiTJ6eEUPlRIowtmyNGC4nUoRZEY0YLidSRECEGuFJlRMpImSLaMRSDmRmhBQZsoF65jZgeTFV
+        ZoQUGRIQlRvLCJUZIUWEKKK3XWndI6SIgN5yPvPwE1XZLVKEubfc7gyPkCKMmXJjaIQUYSJR+Qn4Yk96
+        hBRhGCk3UiNWAi7uwVs1+oCeckONeAfdPyTX4Ksas+WW4UecwU3bQ1YCwWXCEVydKicuhyOYIcuJFC0I
+        8P/Qn7tosvK/5TOR4kykOBMpzqPsfgBphQ1j4i+mWAAAAABJRU5ErkJggg==
+</value>
+  </data>
  <data name="BarButtonUserManager.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
--- a/EDMI_ClientSuite/frmMain.vb
+++ b/EDMI_ClientSuite/frmMain.vb
@@ -24,11 +24,15 @@ Public Class frmMain

    Private Sub SetOnlineLabel()
        If My.Application.Service.Online Then
-            LabelServiceOnline.Caption = "Service Online"
-            LabelServiceOnline.ItemAppearance.Normal.ForeColor = Color.Green
+            LabelServiceOnline.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+            LabelServiceOffline.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+            'LabelServiceOnline.Caption = "Service Online"
+            'LabelServiceOnline.ItemAppearance.Normal.ForeColor = Color.Green
        Else
-            LabelServiceOnline.Caption = "Service Offline"
-            LabelServiceOnline.ItemAppearance.Normal.ForeColor = Color.Red
+            LabelServiceOnline.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+            LabelServiceOffline.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
+            'LabelServiceOnline.Caption = "Service Offline"
+            'LabelServiceOnline.ItemAppearance.Normal.ForeColor = Color.Red
        End If
    End Sub