diff --git a/EDMI_ClientSuite/ClientSuite.vbproj b/EDMI_ClientSuite/ClientSuite.vbproj
index 0e18e009..f444cb1f 100644
--- a/EDMI_ClientSuite/ClientSuite.vbproj
+++ b/EDMI_ClientSuite/ClientSuite.vbproj
@@ -140,6 +140,12 @@
+
+ frmSearch.vb
+
+
+ Form
+
DockManagerTest.vb
@@ -186,22 +192,16 @@
Form
-
- frmDashboard.vb
-
-
- Form
-
frmFileTest.vb
Form
-
- frmInbox.vb
+
+ frmHome.vb
-
+
Form
@@ -288,6 +288,9 @@
+
+ frmSearch.vb
+
DockManagerTest.vb
@@ -303,14 +306,11 @@
frmEntityDesigner.vb
-
- frmDashboard.vb
-
frmFileTest.vb
-
- frmInbox.vb
+
+ frmHome.vb
frmMain.vb
diff --git a/EDMI_ClientSuite/frmDashboard.Designer.vb b/EDMI_ClientSuite/frmDashboard.Designer.vb
deleted file mode 100644
index 12189a97..00000000
--- a/EDMI_ClientSuite/frmDashboard.Designer.vb
+++ /dev/null
@@ -1,37 +0,0 @@
- _
-Partial Class frmDashboard
- Inherits System.Windows.Forms.Form
-
- 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
- _
- Protected Overrides Sub Dispose(ByVal disposing As Boolean)
- Try
- If disposing AndAlso components IsNot Nothing Then
- components.Dispose()
- End If
- Finally
- MyBase.Dispose(disposing)
- End Try
- End Sub
-
- 'Wird vom Windows Form-Designer benötigt.
- Private components As System.ComponentModel.IContainer
-
- 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
- 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
- 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
- _
- Private Sub InitializeComponent()
- Me.SuspendLayout()
- '
- 'frmDashboard
- '
- Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
- Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
- Me.ClientSize = New System.Drawing.Size(800, 450)
- Me.Name = "frmDashboard"
- Me.Text = "Dashboard"
- Me.ResumeLayout(False)
-
- End Sub
-End Class
diff --git a/EDMI_ClientSuite/frmDashboard.vb b/EDMI_ClientSuite/frmDashboard.vb
deleted file mode 100644
index 32034675..00000000
--- a/EDMI_ClientSuite/frmDashboard.vb
+++ /dev/null
@@ -1,4 +0,0 @@
-Imports System.ComponentModel
-
-Public Class frmDashboard
-End Class
\ No newline at end of file
diff --git a/EDMI_ClientSuite/frmInbox.Designer.vb b/EDMI_ClientSuite/frmHome.Designer.vb
similarity index 95%
rename from EDMI_ClientSuite/frmInbox.Designer.vb
rename to EDMI_ClientSuite/frmHome.Designer.vb
index 1b629a2f..ccc3d183 100644
--- a/EDMI_ClientSuite/frmInbox.Designer.vb
+++ b/EDMI_ClientSuite/frmHome.Designer.vb
@@ -1,5 +1,5 @@
_
-Partial Class frmInbox
+Partial Class frmHome
Inherits BaseRibbonForm
'Form overrides dispose to clean up the component list.
@@ -30,6 +30,7 @@ Partial Class frmInbox
Me.TreeListColumn1 = New DevExpress.XtraTreeList.Columns.TreeListColumn()
Me.GridControl1 = New DevExpress.XtraGrid.GridControl()
Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView()
+ Me.NavBarGroup2 = New DevExpress.XtraNavBar.NavBarGroup()
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.NavBarControl1.SuspendLayout()
@@ -73,7 +74,7 @@ Partial Class frmInbox
Me.NavBarControl1.ActiveGroup = Me.NavBarGroup1
Me.NavBarControl1.Controls.Add(Me.NavBarGroupControlContainer1)
Me.NavBarControl1.Dock = System.Windows.Forms.DockStyle.Left
- Me.NavBarControl1.Groups.AddRange(New DevExpress.XtraNavBar.NavBarGroup() {Me.NavBarGroup1})
+ Me.NavBarControl1.Groups.AddRange(New DevExpress.XtraNavBar.NavBarGroup() {Me.NavBarGroup1, Me.NavBarGroup2})
Me.NavBarControl1.Location = New System.Drawing.Point(0, 146)
Me.NavBarControl1.Name = "NavBarControl1"
Me.NavBarControl1.OptionsNavPane.ExpandedWidth = 250
@@ -99,7 +100,7 @@ Partial Class frmInbox
Me.NavBarGroupControlContainer1.Appearance.Options.UseBackColor = True
Me.NavBarGroupControlContainer1.Controls.Add(Me.TreeList1)
Me.NavBarGroupControlContainer1.Name = "NavBarGroupControlContainer1"
- Me.NavBarGroupControlContainer1.Size = New System.Drawing.Size(250, 403)
+ Me.NavBarGroupControlContainer1.Size = New System.Drawing.Size(250, 367)
Me.NavBarGroupControlContainer1.TabIndex = 0
'
'TreeList1
@@ -124,7 +125,7 @@ Partial Class frmInbox
Me.TreeList1.OptionsSelection.EnableAppearanceFocusedCell = False
Me.TreeList1.OptionsView.FocusRectStyle = DevExpress.XtraTreeList.DrawFocusRectStyle.None
Me.TreeList1.OptionsView.ShowIndentAsRowStyle = True
- Me.TreeList1.Size = New System.Drawing.Size(250, 403)
+ Me.TreeList1.Size = New System.Drawing.Size(250, 367)
Me.TreeList1.TabIndex = 0
Me.TreeList1.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView
'
@@ -152,7 +153,12 @@ Partial Class frmInbox
Me.GridView1.GridControl = Me.GridControl1
Me.GridView1.Name = "GridView1"
'
- 'frmInbox
+ 'NavBarGroup2
+ '
+ Me.NavBarGroup2.Caption = "Analysis"
+ Me.NavBarGroup2.Name = "NavBarGroup2"
+ '
+ 'frmHome
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
@@ -161,10 +167,10 @@ Partial Class frmInbox
Me.Controls.Add(Me.NavBarControl1)
Me.Controls.Add(Me.RibbonStatusBar)
Me.Controls.Add(Me.RibbonControl)
- Me.Name = "frmInbox"
+ Me.Name = "frmHome"
Me.Ribbon = Me.RibbonControl
Me.StatusBar = Me.RibbonStatusBar
- Me.Text = "frmInbox"
+ Me.Text = "Home"
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.NavBarControl1.ResumeLayout(False)
@@ -188,4 +194,5 @@ Partial Class frmInbox
Friend WithEvents NavBarGroupControlContainer1 As DevExpress.XtraNavBar.NavBarGroupControlContainer
Friend WithEvents TreeList1 As DevExpress.XtraTreeList.TreeList
Friend WithEvents TreeListColumn1 As DevExpress.XtraTreeList.Columns.TreeListColumn
+ Friend WithEvents NavBarGroup2 As DevExpress.XtraNavBar.NavBarGroup
End Class
diff --git a/EDMI_ClientSuite/frmDashboard.resx b/EDMI_ClientSuite/frmHome.resx
similarity index 100%
rename from EDMI_ClientSuite/frmDashboard.resx
rename to EDMI_ClientSuite/frmHome.resx
diff --git a/EDMI_ClientSuite/frmHome.vb b/EDMI_ClientSuite/frmHome.vb
new file mode 100644
index 00000000..981de050
--- /dev/null
+++ b/EDMI_ClientSuite/frmHome.vb
@@ -0,0 +1,24 @@
+Imports DevExpress.XtraGrid
+Imports DevExpress.XtraTreeList
+
+Public Class frmHome
+ Private Sub frmInbox_Load(sender As Object, e As EventArgs) Handles Me.Load
+ Dim oCommonCommands As New ClassCommonCommands(My.LogConfig)
+
+ Dim oGridPatcher As New ClassControlPatcher(Of GridControl)(Me)
+ oGridPatcher.
+ ProcessContainer(AddressOf GridControlDefaults.DefaultGridSettings).
+ ProcessContainer(AddressOf GridControlDefaults.ReadOnlyGridSettings)
+
+ Dim oTreeListPatcher As New ClassControlPatcher(Of TreeList)(Me)
+ oTreeListPatcher.
+ ProcessContainer(AddressOf TreeListDefaults.DefaultTreeListSettings)
+
+ Dim oSQL As String = "SELECT * FROM VWICM_DOC_METADATA_DE;"
+ My.Channel.CreateDatabaseRequest("Doc Metadata", True)
+ Dim oTable = My.Channel.ReturnDatatable(oSQL)
+ My.Channel.CloseDatabaseRequest()
+
+ GridControl1.DataSource = oTable.Table
+ End Sub
+End Class
\ No newline at end of file
diff --git a/EDMI_ClientSuite/frmInbox.vb b/EDMI_ClientSuite/frmInbox.vb
deleted file mode 100644
index 67a58ff4..00000000
--- a/EDMI_ClientSuite/frmInbox.vb
+++ /dev/null
@@ -1,19 +0,0 @@
-Imports DevExpress.XtraTreeList
-
-Public Class frmInbox
-
-
- Private Sub frmInbox_Load(sender As Object, e As EventArgs) Handles Me.Load
- Dim oCommonCommands As New ClassCommonCommands(My.LogConfig)
- Dim oControlPatcher As New ClassControlPatcher(Of TreeList)(Me)
- oControlPatcher.ProcessContainer(AddressOf TreeListDefaults.DefaultTreeListSettings)
-
-
- Dim oSQL As String = "SELECT * FROM VWICM_DOC_METADATA_DE;"
- My.Channel.CreateDatabaseRequest("Doc Metadata", True)
- Dim oTable = My.Channel.ReturnDatatable(oSQL)
- My.Channel.CloseDatabaseRequest()
-
- GridControl1.DataSource = oTable.Table
- End Sub
-End Class
\ No newline at end of file
diff --git a/EDMI_ClientSuite/frmMain.Designer.vb b/EDMI_ClientSuite/frmMain.Designer.vb
index 6fdb980d..abf68828 100644
--- 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.
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()
@@ -31,9 +30,7 @@ Partial Class frmMain
Me.LabelCurrentMachine = New DevExpress.XtraBars.BarStaticItem()
Me.LabelCurrentVersion = New DevExpress.XtraBars.BarStaticItem()
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
- Me.BarButtonDock1 = New DevExpress.XtraBars.BarButtonItem()
Me.SkinDropDownButtonItem1 = New DevExpress.XtraBars.SkinDropDownButtonItem()
- Me.BarButtonDashboard = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonEntityDesigner = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonDeleteControl = New DevExpress.XtraBars.BarButtonItem()
Me.LabelCurrentLanguage = New DevExpress.XtraBars.BarStaticItem()
@@ -45,50 +42,38 @@ Partial Class frmMain
Me.LabelServiceOffline = New DevExpress.XtraBars.BarStaticItem()
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage()
- Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
- Me.RibbonPageView = New DevExpress.XtraBars.Ribbon.RibbonPage()
- Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
- Me.RibbonPageWorkflow = New DevExpress.XtraBars.Ribbon.RibbonPage()
- Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageAdmin = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+ Me.RibbonPageGroup1 = 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.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel()
- Me.DockPanelGlobix = New DevExpress.XtraBars.Docking.DockPanel()
- Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer()
- Me.Label1 = New System.Windows.Forms.Label()
- Me.DockPanelProcessManager = New DevExpress.XtraBars.Docking.DockPanel()
- Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer()
- Me.ProcessManagerWidget = New DigitalData.GUIs.ClientSuite.ProcessManagerWidget()
- Me.BarButtonInbox = New DevExpress.XtraBars.BarButtonItem()
+ Me.DocumentManager = New DevExpress.XtraBars.Docking2010.DocumentManager()
+ Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView()
+ Me.DockManager = New DevExpress.XtraBars.Docking.DockManager()
+ Me.MainNav = New DevExpress.XtraBars.Navigation.OfficeNavigationBar()
+ Me.NavbarItemHome = New DevExpress.XtraBars.Navigation.NavigationBarItem()
+ Me.NavbarItemSearch = New DevExpress.XtraBars.Navigation.NavigationBarItem()
+ Me.NavbarItemWorkflow = New DevExpress.XtraBars.Navigation.NavigationBarItem()
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DocumentManager, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DockManager, System.ComponentModel.ISupportInitialize).BeginInit()
- Me.panelContainer1.SuspendLayout()
- Me.DockPanelGlobix.SuspendLayout()
- Me.DockPanel1_Container.SuspendLayout()
- Me.DockPanelProcessManager.SuspendLayout()
- Me.DockPanel2_Container.SuspendLayout()
+ CType(Me.MainNav, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'RibbonControl
'
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.LabelServiceOffline, Me.BarButtonItem3, Me.BarButtonInbox})
+ Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.SkinDropDownButtonItem1, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings, Me.LabelCurrentLanguage, Me.BarButtonItem2, Me.BarWorkspaceMenuItem1, Me.LabelServiceOnline, Me.BarButtonUserManager, Me.LabelServiceOffline, Me.BarButtonItem3})
Me.RibbonControl.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl.MaxItemId = 23
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.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPageStart, Me.RibbonPageAdmin})
Me.RibbonControl.Size = New System.Drawing.Size(1139, 146)
Me.RibbonControl.StatusBar = Me.RibbonStatusBar
'
@@ -154,25 +139,11 @@ Partial Class frmMain
Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image)
Me.BarButtonItem1.Name = "BarButtonItem1"
'
- 'BarButtonDock1
- '
- Me.BarButtonDock1.Caption = "Show Panel"
- Me.BarButtonDock1.Id = 9
- Me.BarButtonDock1.Name = "BarButtonDock1"
- '
'SkinDropDownButtonItem1
'
Me.SkinDropDownButtonItem1.Id = 10
Me.SkinDropDownButtonItem1.Name = "SkinDropDownButtonItem1"
'
- 'BarButtonDashboard
- '
- Me.BarButtonDashboard.Caption = "Dashboard"
- Me.BarButtonDashboard.Id = 11
- Me.BarButtonDashboard.ImageOptions.Image = CType(resources.GetObject("BarButtonDashboard.ImageOptions.Image"), System.Drawing.Image)
- Me.BarButtonDashboard.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonDashboard.ImageOptions.LargeImage"), System.Drawing.Image)
- Me.BarButtonDashboard.Name = "BarButtonDashboard"
- '
'BarButtonEntityDesigner
'
Me.BarButtonEntityDesigner.Caption = "Entitäten Designer"
@@ -246,17 +217,10 @@ Partial Class frmMain
'
'RibbonPageStart
'
- Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3})
+ Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3})
Me.RibbonPageStart.Name = "RibbonPageStart"
Me.RibbonPageStart.Text = "Start"
'
- 'RibbonPageGroup1
- '
- Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonDashboard)
- Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonInbox)
- Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
- Me.RibbonPageGroup1.Text = "RibbonPageGroup1"
- '
'RibbonPageGroup3
'
Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
@@ -265,33 +229,9 @@ Partial Class frmMain
Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
Me.RibbonPageGroup3.Text = "DEBUG"
'
- 'RibbonPageView
- '
- Me.RibbonPageView.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
- Me.RibbonPageView.Name = "RibbonPageView"
- Me.RibbonPageView.Text = "View"
- '
- 'RibbonPageGroup2
- '
- Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonDock1)
- Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
- Me.RibbonPageGroup2.Text = "RibbonPageGroup2"
- '
- 'RibbonPageWorkflow
- '
- Me.RibbonPageWorkflow.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup4})
- Me.RibbonPageWorkflow.Name = "RibbonPageWorkflow"
- Me.RibbonPageWorkflow.Text = "Workflow"
- '
- 'RibbonPageGroup4
- '
- Me.RibbonPageGroup4.ItemLinks.Add(Me.BarButtonEntityDesigner)
- Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
- Me.RibbonPageGroup4.Text = "RibbonPageGroup4"
- '
'RibbonPageAdmin
'
- Me.RibbonPageAdmin.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup6})
+ Me.RibbonPageAdmin.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup6, Me.RibbonPageGroup1})
Me.RibbonPageAdmin.Name = "RibbonPageAdmin"
Me.RibbonPageAdmin.Text = "Administration"
'
@@ -299,7 +239,13 @@ Partial Class frmMain
'
Me.RibbonPageGroup6.ItemLinks.Add(Me.BarButtonUserManager)
Me.RibbonPageGroup6.Name = "RibbonPageGroup6"
- Me.RibbonPageGroup6.Text = "RibbonPageGroup6"
+ Me.RibbonPageGroup6.Text = "Benutzer und Gruppen"
+ '
+ 'RibbonPageGroup1
+ '
+ Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonEntityDesigner)
+ Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
+ Me.RibbonPageGroup1.Text = "Inhalte"
'
'RibbonStatusBar
'
@@ -323,103 +269,46 @@ Partial Class frmMain
'
'TabbedView1
'
+ Me.TabbedView1.DocumentProperties.AllowPin = True
Me.TabbedView1.EnableFreeLayoutMode = DevExpress.Utils.DefaultBoolean.[True]
'
'DockManager
'
+ Me.DockManager.DockingOptions.HideImmediatelyOnAutoHide = True
Me.DockManager.Form = Me
- Me.DockManager.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.panelContainer1})
Me.DockManager.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.StatusBar", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl"})
'
- 'panelContainer1
+ 'MainNav
'
- Me.panelContainer1.Controls.Add(Me.DockPanelGlobix)
- 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.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.Text = "panelContainer1"
+ Me.MainNav.Dock = System.Windows.Forms.DockStyle.Bottom
+ Me.MainNav.Items.AddRange(New DevExpress.XtraBars.Navigation.NavigationBarItem() {Me.NavbarItemHome, Me.NavbarItemSearch, Me.NavbarItemWorkflow})
+ Me.MainNav.Location = New System.Drawing.Point(0, 511)
+ Me.MainNav.Name = "MainNav"
+ Me.MainNav.Size = New System.Drawing.Size(1139, 45)
+ Me.MainNav.TabIndex = 4
+ Me.MainNav.Text = "OfficeNavigationBar1"
'
- 'DockPanelGlobix
+ 'NavbarItemHome
'
- Me.DockPanelGlobix.Controls.Add(Me.DockPanel1_Container)
- Me.DockPanelGlobix.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
- Me.DockPanelGlobix.ID = New System.Guid("804984d7-b275-4115-ab10-a8322f0a8a7e")
- 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(346, 202)
- Me.DockPanelGlobix.SavedSizeFactor = 0R
- Me.DockPanelGlobix.Size = New System.Drawing.Size(346, 206)
- Me.DockPanelGlobix.Text = "GLOBIX"
+ Me.NavbarItemHome.Name = "NavbarItemHome"
+ Me.NavbarItemHome.Text = "Home"
'
- 'DockPanel1_Container
+ 'NavbarItemSearch
'
- Me.DockPanel1_Container.Controls.Add(Me.Label1)
- Me.DockPanel1_Container.Location = New System.Drawing.Point(5, 38)
- Me.DockPanel1_Container.Name = "DockPanel1_Container"
- Me.DockPanel1_Container.Size = New System.Drawing.Size(337, 163)
- Me.DockPanel1_Container.TabIndex = 0
+ Me.NavbarItemSearch.Name = "NavbarItemSearch"
+ Me.NavbarItemSearch.Text = "Search"
'
- 'Label1
+ 'NavbarItemWorkflow
'
- Me.Label1.Dock = System.Windows.Forms.DockStyle.Fill
- 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, 163)
- Me.Label1.TabIndex = 0
- Me.Label1.Text = "DROP FILES HERE"
- Me.Label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
- '
- 'DockPanelProcessManager
- '
- 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, 206)
- Me.DockPanelProcessManager.Name = "DockPanelProcessManager"
- Me.DockPanelProcessManager.Options.ShowCloseButton = False
- Me.DockPanelProcessManager.OriginalSize = New System.Drawing.Size(346, 201)
- Me.DockPanelProcessManager.SavedSizeFactor = 0R
- Me.DockPanelProcessManager.Size = New System.Drawing.Size(346, 204)
- 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.Name = "DockPanel2_Container"
- Me.DockPanel2_Container.Size = New System.Drawing.Size(337, 162)
- Me.DockPanel2_Container.TabIndex = 0
- '
- 'ProcessManagerWidget
- '
- Me.ProcessManagerWidget.DataSource = Nothing
- 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, 162)
- Me.ProcessManagerWidget.TabIndex = 0
- '
- 'BarButtonInbox
- '
- Me.BarButtonInbox.Caption = "Inbox"
- Me.BarButtonInbox.Id = 22
- Me.BarButtonInbox.ImageOptions.Image = CType(resources.GetObject("BarButtonItem4.ImageOptions.Image"), System.Drawing.Image)
- Me.BarButtonInbox.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.LargeImage"), System.Drawing.Image)
- Me.BarButtonInbox.Name = "BarButtonInbox"
+ Me.NavbarItemWorkflow.Name = "NavbarItemWorkflow"
+ Me.NavbarItemWorkflow.Text = "Workflow"
'
'frmMain
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(1139, 577)
- Me.Controls.Add(Me.panelContainer1)
+ Me.Controls.Add(Me.MainNav)
Me.Controls.Add(Me.RibbonStatusBar)
Me.Controls.Add(Me.RibbonControl)
Me.IsMdiContainer = True
@@ -432,11 +321,7 @@ Partial Class frmMain
CType(Me.DocumentManager, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TabbedView1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.DockManager, System.ComponentModel.ISupportInitialize).EndInit()
- Me.panelContainer1.ResumeLayout(False)
- Me.DockPanelGlobix.ResumeLayout(False)
- Me.DockPanel1_Container.ResumeLayout(False)
- Me.DockPanelProcessManager.ResumeLayout(False)
- Me.DockPanel2_Container.ResumeLayout(False)
+ CType(Me.MainNav, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -444,7 +329,6 @@ Partial Class frmMain
Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl
Friend WithEvents RibbonPageStart As DevExpress.XtraBars.Ribbon.RibbonPage
- Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar
Friend WithEvents MainMenu As DevExpress.XtraBars.Ribbon.ApplicationMenu
Friend WithEvents BarButtonExit As DevExpress.XtraBars.BarButtonItem
@@ -453,25 +337,12 @@ Partial Class frmMain
Friend WithEvents LabelCurrentMachine As DevExpress.XtraBars.BarStaticItem
Friend WithEvents LabelCurrentVersion As DevExpress.XtraBars.BarStaticItem
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
- Friend WithEvents BarButtonDock1 As DevExpress.XtraBars.BarButtonItem
- Friend WithEvents RibbonPageView As DevExpress.XtraBars.Ribbon.RibbonPage
- Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents NativeMdiView1 As DevExpress.XtraBars.Docking2010.Views.NativeMdi.NativeMdiView
Friend WithEvents DocumentManager As DevExpress.XtraBars.Docking2010.DocumentManager
Friend WithEvents TabbedView1 As DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView
Friend WithEvents DockManager As DevExpress.XtraBars.Docking.DockManager
- Friend WithEvents DockPanelGlobix As DevExpress.XtraBars.Docking.DockPanel
- Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer
- Friend WithEvents Label1 As Label
- Friend WithEvents DockPanelProcessManager As DevExpress.XtraBars.Docking.DockPanel
- Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer
- Friend WithEvents panelContainer1 As DevExpress.XtraBars.Docking.DockPanel
Friend WithEvents SkinDropDownButtonItem1 As DevExpress.XtraBars.SkinDropDownButtonItem
- Friend WithEvents BarButtonDashboard As DevExpress.XtraBars.BarButtonItem
Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
- Friend WithEvents ProcessManagerWidget As ProcessManagerWidget
- Friend WithEvents RibbonPageWorkflow As DevExpress.XtraBars.Ribbon.RibbonPage
- Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents BarButtonEntityDesigner As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonDeleteControl As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonConnectionSettings As DevExpress.XtraBars.BarButtonItem
@@ -485,5 +356,9 @@ Partial Class frmMain
Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents LabelServiceOffline As DevExpress.XtraBars.BarStaticItem
Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
- Friend WithEvents BarButtonInbox As DevExpress.XtraBars.BarButtonItem
+ Friend WithEvents MainNav As DevExpress.XtraBars.Navigation.OfficeNavigationBar
+ Friend WithEvents NavbarItemHome As DevExpress.XtraBars.Navigation.NavigationBarItem
+ Friend WithEvents NavbarItemSearch As DevExpress.XtraBars.Navigation.NavigationBarItem
+ Friend WithEvents NavbarItemWorkflow As DevExpress.XtraBars.Navigation.NavigationBarItem
+ Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
End Class
diff --git a/EDMI_ClientSuite/frmMain.resx b/EDMI_ClientSuite/frmMain.resx
index c4dc9abd..eaa41dd5 100644
--- a/EDMI_ClientSuite/frmMain.resx
+++ b/EDMI_ClientSuite/frmMain.resx
@@ -258,28 +258,6 @@
6rZH6NG6Ev4hdBEzYOFbB1GRcZPAQzo2yVt0MLNPoaESGiqhoRIaKqEhSCnZTSZndNB7gO0ANATe5J/r
hfs556WUMvqxn7U7/0ND8ESg1kolZAIoJiEVQPUScgHUJjFD4hMBVJPwf4eH2aAheCJwws+v0D00BGh8
q7ZZdA8NQQiEQAiEQAiEQAig6U36+Q0aKqGhEhrqsGEFMnodJsvjoggAAAAASUVORK5CYII=
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAANRJREFUOE+d
- kT0OgkAQhbG18WQmXsA7AI0dCWZbo7fRxMJGUC9j/MN2nDdhyC6wsLH4YHg770vIRsYYHxNmw+SazdcH
- AvoNmqEFylsGy0AkoQK7fGTKes65nI0J2uUpM2McCb+bzlhZzyApVmYnEitvBENlRSSMI8EjpKx0JAhx
- VQjAUFmBRPczBEtmXwe6pAtt7PMTs9AAv+EsVNeEHkUqfC5JnwAd5xachTeX7udUeJW9ApkjIhLsEPP3
- FtOzTIXqGncE2vMKPAQLxvAKgukI/oOiH3DIH9LquF+BAAAAAElFTkSuQmCC
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
- dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEhvbWU7HnRkOAAAATpJREFUWEft
- ks0NwjAMRkHMxQhw7wIMwAhVJ+BH4oSEgBlgAObhwhUR7KqunMRO2zSUSw9Pbb7a+R4SE2PMX6lfiqKI
- YVohfQuSQmAGnIED0FmirwCWXwFT0Vmij4BbLkos8rvhUE7ECmjlRC3xCwGpfAecnKyUgNJXSgGtHH8t
- fvMklvltziUgs+7sIhAq5zNBCTjzO1sLSOVbQPrHByXg3ZpvI9ClnFAl4GnNNgnElBOiBGDthgT6lBON
- EppAinIiKCEJpCwnVAlJ4MKGkL7lhCSxlwRWwIcNpSgnUILufQOZJICgxAbAQX4BQZc0oe0egQzPmgAf
- drMyfz7WQXDG2al3+dkT4NCwlEulHJxx9xAt9wJkFBgFQgJtcPcQLfcCpLpI/BbLKBAjkBy3B/GCoRHD
- IRHD4TCTL7ccmUyvvNxMAAAAAElFTkSuQmCC
@@ -425,26 +403,6 @@
ldBSCS1BCKHsZDJGA3s3sDsALYFtssfnwfcxxmdKabRle9ZqvYSWoEcg50wlZAIIk5AKIK2EXACZJR6Q
OEUAqRL2bvNjVmgJegTecLdP6D20BNh4VOaz6D20BD8ncLnedrGMT8An4BPwCfzHBL6JC3QLHEl7foWW
SmiphJZKaKmjDC/fWMVvGNRzeQAAAABJRU5ErkJggg==
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJHRFWHRUaXRsZQBDb21tZW50
- O1Rvb2x0aXA7SGludDtUaXA7Q2xvdWTTwdvJAAAAYUlEQVQ4T2P4//8/RZjBt2lHAxD/JxM3gAzAJkE0
- Ho4GwEIXHxsZU98AUvEwMYCypAwNWTCNjIFivkgKkTFIHK4OrBlZAIah4uiGgDWDMEwdiiZkDFMI1YSi
- GYQh6v4zAAANA4rK4wvslQAAAABJRU5ErkJggg==
-
-
-
-
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJHRFWHRUaXRsZQBDb21tZW50
- O1Rvb2x0aXA7SGludDtUaXA7Q2xvdWTTwdvJAAAA00lEQVRYR+2WwQ3CMAxFe+paTNClOMEN1mAClior
- GDtKJRP/CjcijpByeFH069ovvTQTEXUFhpHAMBIYRgLDSNKynJ8zc2dWhhrzYmTWrAVu+WEkFy0QcfKS
- VQugguYMgSHgFXgwp4zsa3ODV0AaSY0g+9rc8DcCRz/1Xm7wCjRjCAwBLdD9d9zjQnLVAtuVTK5LqPiX
- wCtZDQuDBpRIHXo/zU5LDbnJN4mP4agPDD2oxnsS5uSoDwy9qOalhBkuoB4wPIIasEnA4QJ6H4aRwDAO
- mt5+ylxK+IuO/gAAAABJRU5ErkJggg==
diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb
index 91df07b8..bbf0478b 100644
--- a/EDMI_ClientSuite/frmMain.vb
+++ b/EDMI_ClientSuite/frmMain.vb
@@ -6,6 +6,8 @@ Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.License
Imports DevExpress.LookAndFeel
Imports DevExpress.XtraBars.Ribbon
+Imports DevExpress.XtraBars.Docking
+Imports DevExpress.XtraGrid
Public Class frmMain
Private _Timer As ClassTimer
@@ -41,37 +43,24 @@ Public Class frmMain
' Initialize Main Timer
_Timer = New ClassTimer(My.LogConfig, Me, My.SysConfig.HeartbeatInterval)
AddHandler _Timer.OnlineChanged, AddressOf HandleOnlineChanged
+
+ ' Show Service Status Label
SetOnlineLabel()
+
+ ' Apply Selected Skin Style
UserLookAndFeel.Default.SetSkinStyle(My.UIConfig.SkinName)
+ ' Show User Info
LabelCurrentUser.Caption = My.Application.User.UserName
LabelCurrentMachine.Caption = My.Application.User.MachineName
LabelCurrentVersion.Caption = My.Application.Info.Version.ToString
LabelCurrentLanguage.Caption = My.Application.User.Language
- Dim oDashboard = New frmDashboard()
- oDashboard.MdiParent = DocumentManager.MdiParent
- oDashboard.Show()
-
- ' --- Process Manager Panel ---
- Dim oDataTable = New DataTable("PMDocuments")
- Dim oDocNameColumn = New DataColumn("DocName", GetType(String))
- oDataTable.Columns.Add(oDocNameColumn)
-
- Dim oRow = oDataTable.NewRow()
- oRow.Item("DocName") = "test1.xlsx"
-
- oDataTable.Rows.Add(oRow)
-
- ProcessManagerWidget.DataSource = oDataTable
- AddHandler ProcessManagerWidget.RowDoubleClicked, Sub(RowView As DataRowView)
- MsgBox($"Clicked on Document {RowView.Row.Item("DocName")}")
- End Sub
-
+ ' Load and Save Layout
AddHandler UserLookAndFeel.Default.StyleChanged, AddressOf frmMain_StyleChanged
-
LoadLayout()
+ ' We're done loading now
_Loading = False
Catch ex As Exception
_ErrorHandler.ShowErrorMessage(ex)
@@ -95,11 +84,11 @@ Public Class frmMain
Dim oLayoutPathForDocumentManager As String = GetLayoutPath(GroupName.LayoutMain, LayoutComponent.DocumentManager)
If File.Exists(oLayoutPathForDockManager) Then
- DockManager.RestoreLayoutFromXml(oLayoutPathForDockManager)
+ 'DockManager.RestoreLayoutFromXml(oLayoutPathForDockManager)
End If
If File.Exists(oLayoutPathForDocumentManager) Then
- DocumentManager.View.RestoreLayoutFromXml(oLayoutPathForDocumentManager)
+ 'DocumentManager.View.RestoreLayoutFromXml(oLayoutPathForDocumentManager)
End If
Catch ex As Exception
_ErrorHandler.ShowErrorMessage(ex)
@@ -115,8 +104,8 @@ Public Class frmMain
Directory.CreateDirectory(oDirectory)
End If
- DockManager.SaveLayoutToXml(oLayoutPathForDockManager)
- DocumentManager.View.SaveLayoutToXml(oLayoutPathForDocumentManager)
+ 'DockManager.SaveLayoutToXml(oLayoutPathForDockManager)
+ 'DocumentManager.View.SaveLayoutToXml(oLayoutPathForDocumentManager)
Catch ex As Exception
_ErrorHandler.ShowErrorMessage(ex)
End Try
@@ -128,11 +117,6 @@ Public Class frmMain
frm.Show()
End Sub
- Private Sub BarButtonDashboard_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonDashboard.ItemClick
- Dim frm As New frmDashboard()
- frm.MdiParent = DocumentManager.MdiParent
- frm.Show()
- End Sub
Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick
Dim frm As New frmFileTest()
@@ -200,10 +184,54 @@ Public Class frmMain
frm.Show()
End Sub
- Private Sub BarButtonInbox_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonInbox.ItemClick
- Dim oForm As New frmInbox With {
+ Private Sub BarButtonInbox_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs)
+ Dim oForm As New frmHome With {
.MdiParent = DocumentManager.MdiParent
}
oForm.Show()
End Sub
+
+ Private Sub MainNav_SelectedItemChanging(sender As Object, e As DevExpress.XtraBars.Navigation.SelectedItemChangingEventArgs) Handles MainNav.SelectedItemChanging
+ Select Case e.Item.Name
+ Case NavbarItemHome.Name
+ Dim oForm As New frmHome()
+ oForm.MdiParent = DocumentManager.MdiParent
+ oForm.Show()
+ Case NavbarItemSearch.Name
+ Dim oForm As New frmSearch()
+ oForm.MdiParent = DocumentManager.MdiParent
+ oForm.Show()
+
+ Dim oSearchPanel = DockManager.AddPanel(DockingStyle.Bottom)
+ oSearchPanel.Options.ShowCloseButton = False
+ oSearchPanel.Options.ShowAutoHideButton = False
+ oSearchPanel.Text = "Search " & New Random().Next()
+ oSearchPanel.Controls.Add(New GridControl With {.Dock = DockStyle.Fill})
+
+ Dim oSearchPanel2 = DockManager.AddPanel(DockingStyle.Bottom)
+ oSearchPanel2.Options.ShowCloseButton = False
+ oSearchPanel2.Options.ShowAutoHideButton = False
+ oSearchPanel2.Text = "Search " & New Random().Next()
+ oSearchPanel2.Controls.Add(New GridControl With {.Dock = DockStyle.Fill})
+
+ oSearchPanel2.DockTo(oSearchPanel)
+
+ AddHandler oForm.FormClosed, Sub()
+ oSearchPanel.Close()
+ oSearchPanel2.Close()
+ End Sub
+
+ 'AddHandler oForm.Deactivate, Sub()
+ ' oSearchPanel.Visibility = DockVisibility.Hidden
+ ' oSearchPanel2.Visibility = DockVisibility.Hidden
+ ' End Sub
+
+ 'AddHandler oForm.Activated, Sub()
+ ' oSearchPanel2.Visibility = DockVisibility.Visible
+ ' oSearchPanel.Visibility = DockVisibility.Visible
+ ' End Sub
+ End Select
+
+ e.Cancel = True
+ End Sub
End Class
\ No newline at end of file
diff --git a/EDMI_ClientSuite/frmSearch.Designer.vb b/EDMI_ClientSuite/frmSearch.Designer.vb
new file mode 100644
index 00000000..cabcf6ec
--- /dev/null
+++ b/EDMI_ClientSuite/frmSearch.Designer.vb
@@ -0,0 +1,384 @@
+ _
+Partial Class frmSearch
+ Inherits DevExpress.XtraBars.Ribbon.RibbonForm
+
+ 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+ _
+ Protected Overrides Sub Dispose(ByVal disposing As Boolean)
+ Try
+ If disposing AndAlso components IsNot Nothing Then
+ components.Dispose()
+ End If
+ Finally
+ MyBase.Dispose(disposing)
+ End Try
+ End Sub
+
+ 'Wird vom Windows Form-Designer benötigt.
+ Private components As System.ComponentModel.IContainer
+
+ 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich.
+ 'Das Bearbeiten ist mit dem Windows Form-Designer möglich.
+ 'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
+ _
+ Private Sub InitializeComponent()
+ Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSearch))
+ Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+ Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+ Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+ Me.RibbonPageCategory1 = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
+ Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+ Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+ Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+ Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+ Me.NavBarControl1 = New DevExpress.XtraNavBar.NavBarControl()
+ Me.NavBarGroup1 = New DevExpress.XtraNavBar.NavBarGroup()
+ Me.NavBarGroupControlContainer1 = New DevExpress.XtraNavBar.NavBarGroupControlContainer()
+ Me.ImageListBoxControl1 = New DevExpress.XtraEditors.ImageListBoxControl()
+ Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
+ Me.textEdit1 = New DevExpress.XtraEditors.TextEdit()
+ Me.textEdit2 = New DevExpress.XtraEditors.TextEdit()
+ Me.textEdit3 = New DevExpress.XtraEditors.TextEdit()
+ Me.textEdit4 = New DevExpress.XtraEditors.TextEdit()
+ Me.textEdit5 = New DevExpress.XtraEditors.TextEdit()
+ Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
+ Me.LayoutControlGroup4 = New DevExpress.XtraLayout.LayoutControlGroup()
+ Me.layoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.layoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.layoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.layoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.layoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
+ CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.NavBarControl1.SuspendLayout()
+ Me.NavBarGroupControlContainer1.SuspendLayout()
+ CType(Me.ImageListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.LayoutControl1.SuspendLayout()
+ CType(Me.textEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.textEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.textEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.textEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlGroup4, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.layoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.layoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.layoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.layoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.layoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
+ Me.SuspendLayout()
+ '
+ 'RibbonControl1
+ '
+ Me.RibbonControl1.ExpandCollapseItem.Id = 0
+ Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.BarButtonItem1, Me.BarButtonItem2})
+ Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
+ Me.RibbonControl1.MaxItemId = 3
+ Me.RibbonControl1.Name = "RibbonControl1"
+ Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1})
+ Me.RibbonControl1.Size = New System.Drawing.Size(1220, 146)
+ Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+ '
+ 'BarButtonItem1
+ '
+ Me.BarButtonItem1.Caption = "Execute Search"
+ Me.BarButtonItem1.Id = 1
+ Me.BarButtonItem1.ImageOptions.Image = CType(resources.GetObject("BarButtonItem1.ImageOptions.Image"), System.Drawing.Image)
+ Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image)
+ Me.BarButtonItem1.Name = "BarButtonItem1"
+ '
+ 'BarButtonItem2
+ '
+ Me.BarButtonItem2.Caption = "Save Search"
+ Me.BarButtonItem2.Id = 2
+ Me.BarButtonItem2.ImageOptions.Image = CType(resources.GetObject("BarButtonItem2.ImageOptions.Image"), System.Drawing.Image)
+ Me.BarButtonItem2.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.LargeImage"), System.Drawing.Image)
+ Me.BarButtonItem2.Name = "BarButtonItem2"
+ '
+ 'RibbonPageCategory1
+ '
+ Me.RibbonPageCategory1.Name = "RibbonPageCategory1"
+ Me.RibbonPageCategory1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage3})
+ Me.RibbonPageCategory1.Text = "RibbonPageCategory1"
+ '
+ 'RibbonPage3
+ '
+ Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
+ Me.RibbonPage3.Name = "RibbonPage3"
+ Me.RibbonPage3.Text = "RibbonPage3"
+ '
+ 'RibbonPageGroup2
+ '
+ Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1)
+ Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2)
+ Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
+ Me.RibbonPageGroup2.Text = "RibbonPageGroup2"
+ '
+ 'RibbonStatusBar1
+ '
+ Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 680)
+ Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+ Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+ Me.RibbonStatusBar1.Size = New System.Drawing.Size(1220, 21)
+ '
+ 'RibbonPage2
+ '
+ Me.RibbonPage2.Name = "RibbonPage2"
+ Me.RibbonPage2.Text = "RibbonPage2"
+ '
+ 'NavBarControl1
+ '
+ Me.NavBarControl1.ActiveGroup = Me.NavBarGroup1
+ Me.NavBarControl1.Controls.Add(Me.NavBarGroupControlContainer1)
+ Me.NavBarControl1.Dock = System.Windows.Forms.DockStyle.Right
+ Me.NavBarControl1.Groups.AddRange(New DevExpress.XtraNavBar.NavBarGroup() {Me.NavBarGroup1})
+ Me.NavBarControl1.Location = New System.Drawing.Point(970, 146)
+ Me.NavBarControl1.Name = "NavBarControl1"
+ Me.NavBarControl1.OptionsNavPane.ExpandedWidth = 250
+ Me.NavBarControl1.OptionsNavPane.ShowOverflowButton = False
+ Me.NavBarControl1.OptionsNavPane.ShowOverflowPanel = False
+ Me.NavBarControl1.PaintStyleKind = DevExpress.XtraNavBar.NavBarViewKind.NavigationPane
+ Me.NavBarControl1.Size = New System.Drawing.Size(250, 534)
+ Me.NavBarControl1.TabIndex = 3
+ Me.NavBarControl1.Text = "NavBarControl1"
+ '
+ 'NavBarGroup1
+ '
+ Me.NavBarGroup1.Caption = "Forward To"
+ Me.NavBarGroup1.ControlContainer = Me.NavBarGroupControlContainer1
+ Me.NavBarGroup1.Expanded = True
+ Me.NavBarGroup1.GroupClientHeight = 369
+ Me.NavBarGroup1.GroupStyle = DevExpress.XtraNavBar.NavBarGroupStyle.ControlContainer
+ Me.NavBarGroup1.Name = "NavBarGroup1"
+ '
+ 'NavBarGroupControlContainer1
+ '
+ Me.NavBarGroupControlContainer1.Appearance.BackColor = System.Drawing.SystemColors.Control
+ Me.NavBarGroupControlContainer1.Appearance.Options.UseBackColor = True
+ Me.NavBarGroupControlContainer1.Controls.Add(Me.ImageListBoxControl1)
+ Me.NavBarGroupControlContainer1.Name = "NavBarGroupControlContainer1"
+ Me.NavBarGroupControlContainer1.Size = New System.Drawing.Size(250, 453)
+ Me.NavBarGroupControlContainer1.TabIndex = 0
+ '
+ 'ImageListBoxControl1
+ '
+ Me.ImageListBoxControl1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.ImageListBoxControl1.Location = New System.Drawing.Point(0, 0)
+ Me.ImageListBoxControl1.Name = "ImageListBoxControl1"
+ Me.ImageListBoxControl1.Size = New System.Drawing.Size(250, 453)
+ Me.ImageListBoxControl1.TabIndex = 0
+ '
+ 'LayoutControl1
+ '
+ Me.LayoutControl1.Controls.Add(Me.textEdit1)
+ Me.LayoutControl1.Controls.Add(Me.textEdit2)
+ Me.LayoutControl1.Controls.Add(Me.textEdit3)
+ Me.LayoutControl1.Controls.Add(Me.textEdit4)
+ Me.LayoutControl1.Controls.Add(Me.textEdit5)
+ Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.LayoutControl1.Location = New System.Drawing.Point(0, 146)
+ Me.LayoutControl1.Name = "LayoutControl1"
+ Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(551, 62, 650, 400)
+ Me.LayoutControl1.Root = Me.LayoutControlGroup1
+ Me.LayoutControl1.Size = New System.Drawing.Size(970, 534)
+ Me.LayoutControl1.TabIndex = 6
+ Me.LayoutControl1.Text = "LayoutControl1"
+ '
+ 'textEdit1
+ '
+ Me.textEdit1.Location = New System.Drawing.Point(12, 28)
+ Me.textEdit1.Name = "textEdit1"
+ Me.textEdit1.Size = New System.Drawing.Size(400, 20)
+ Me.textEdit1.StyleController = Me.LayoutControl1
+ Me.textEdit1.TabIndex = 4
+ '
+ 'textEdit2
+ '
+ Me.textEdit2.Location = New System.Drawing.Point(12, 68)
+ Me.textEdit2.Name = "textEdit2"
+ Me.textEdit2.Size = New System.Drawing.Size(400, 20)
+ Me.textEdit2.StyleController = Me.LayoutControl1
+ Me.textEdit2.TabIndex = 5
+ '
+ 'textEdit3
+ '
+ Me.textEdit3.Location = New System.Drawing.Point(12, 108)
+ Me.textEdit3.Name = "textEdit3"
+ Me.textEdit3.Properties.Mask.EditMask = "[a-zA-Z]+"
+ Me.textEdit3.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.RegEx
+ Me.textEdit3.Size = New System.Drawing.Size(400, 20)
+ Me.textEdit3.StyleController = Me.LayoutControl1
+ Me.textEdit3.TabIndex = 6
+ '
+ 'textEdit4
+ '
+ Me.textEdit4.Location = New System.Drawing.Point(12, 148)
+ Me.textEdit4.Name = "textEdit4"
+ Me.textEdit4.Properties.Mask.EditMask = "[a-zA-Z]+"
+ Me.textEdit4.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.RegEx
+ Me.textEdit4.Size = New System.Drawing.Size(400, 20)
+ Me.textEdit4.StyleController = Me.LayoutControl1
+ Me.textEdit4.TabIndex = 7
+ '
+ 'textEdit5
+ '
+ Me.textEdit5.Location = New System.Drawing.Point(12, 188)
+ Me.textEdit5.Name = "textEdit5"
+ Me.textEdit5.Properties.Mask.EditMask = "00000"
+ Me.textEdit5.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.Simple
+ Me.textEdit5.Size = New System.Drawing.Size(400, 20)
+ Me.textEdit5.StyleController = Me.LayoutControl1
+ Me.textEdit5.TabIndex = 8
+ '
+ 'LayoutControlGroup1
+ '
+ Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
+ Me.LayoutControlGroup1.GroupBordersVisible = False
+ Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup4, Me.layoutControlItem1, Me.layoutControlItem2, Me.layoutControlItem3, Me.layoutControlItem4, Me.layoutControlItem5})
+ Me.LayoutControlGroup1.Name = "Root"
+ Me.LayoutControlGroup1.Size = New System.Drawing.Size(970, 534)
+ Me.LayoutControlGroup1.TextVisible = False
+ '
+ 'LayoutControlGroup4
+ '
+ Me.LayoutControlGroup4.CustomizationFormText = "layoutControlGroup3"
+ Me.LayoutControlGroup4.GroupBordersVisible = False
+ Me.LayoutControlGroup4.Location = New System.Drawing.Point(0, 200)
+ Me.LayoutControlGroup4.Name = "LayoutControlGroup4"
+ Me.LayoutControlGroup4.Size = New System.Drawing.Size(950, 314)
+ Me.LayoutControlGroup4.Text = "layoutControlGroup3"
+ '
+ 'layoutControlItem1
+ '
+ Me.layoutControlItem1.Control = Me.textEdit1
+ Me.layoutControlItem1.CustomizationFormText = "Address line 1:"
+ Me.layoutControlItem1.Location = New System.Drawing.Point(0, 0)
+ Me.layoutControlItem1.MaxSize = New System.Drawing.Size(404, 0)
+ Me.layoutControlItem1.MinSize = New System.Drawing.Size(116, 40)
+ Me.layoutControlItem1.Name = "layoutControlItem1"
+ Me.layoutControlItem1.Size = New System.Drawing.Size(950, 40)
+ Me.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
+ Me.layoutControlItem1.Text = "Address line 1:"
+ Me.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top
+ Me.layoutControlItem1.TextSize = New System.Drawing.Size(112, 13)
+ '
+ 'layoutControlItem2
+ '
+ Me.layoutControlItem2.Control = Me.textEdit2
+ Me.layoutControlItem2.CustomizationFormText = "Address line 2:"
+ Me.layoutControlItem2.Location = New System.Drawing.Point(0, 40)
+ Me.layoutControlItem2.MaxSize = New System.Drawing.Size(404, 0)
+ Me.layoutControlItem2.MinSize = New System.Drawing.Size(116, 40)
+ Me.layoutControlItem2.Name = "layoutControlItem2"
+ Me.layoutControlItem2.Size = New System.Drawing.Size(950, 40)
+ Me.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
+ Me.layoutControlItem2.Text = "Address line 2:"
+ Me.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top
+ Me.layoutControlItem2.TextSize = New System.Drawing.Size(112, 13)
+ '
+ 'layoutControlItem3
+ '
+ Me.layoutControlItem3.Control = Me.textEdit3
+ Me.layoutControlItem3.CustomizationFormText = "City:"
+ Me.layoutControlItem3.Location = New System.Drawing.Point(0, 80)
+ Me.layoutControlItem3.MaxSize = New System.Drawing.Size(404, 0)
+ Me.layoutControlItem3.MinSize = New System.Drawing.Size(116, 40)
+ Me.layoutControlItem3.Name = "layoutControlItem3"
+ Me.layoutControlItem3.Size = New System.Drawing.Size(950, 40)
+ Me.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
+ Me.layoutControlItem3.Text = "City:"
+ Me.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
+ Me.layoutControlItem3.TextSize = New System.Drawing.Size(112, 13)
+ '
+ 'layoutControlItem4
+ '
+ Me.layoutControlItem4.Control = Me.textEdit4
+ Me.layoutControlItem4.CustomizationFormText = "State/Province/Region:"
+ Me.layoutControlItem4.Location = New System.Drawing.Point(0, 120)
+ Me.layoutControlItem4.MaxSize = New System.Drawing.Size(404, 0)
+ Me.layoutControlItem4.MinSize = New System.Drawing.Size(116, 40)
+ Me.layoutControlItem4.Name = "layoutControlItem4"
+ Me.layoutControlItem4.Size = New System.Drawing.Size(950, 40)
+ Me.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
+ Me.layoutControlItem4.Text = "State/Province/Region:"
+ Me.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top
+ Me.layoutControlItem4.TextSize = New System.Drawing.Size(112, 13)
+ '
+ 'layoutControlItem5
+ '
+ Me.layoutControlItem5.Control = Me.textEdit5
+ Me.layoutControlItem5.CustomizationFormText = "ZIP:"
+ Me.layoutControlItem5.Location = New System.Drawing.Point(0, 160)
+ Me.layoutControlItem5.MaxSize = New System.Drawing.Size(404, 0)
+ Me.layoutControlItem5.MinSize = New System.Drawing.Size(116, 40)
+ Me.layoutControlItem5.Name = "layoutControlItem5"
+ Me.layoutControlItem5.Size = New System.Drawing.Size(950, 40)
+ Me.layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom
+ Me.layoutControlItem5.Text = "ZIP:"
+ Me.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top
+ Me.layoutControlItem5.TextSize = New System.Drawing.Size(112, 13)
+ '
+ 'frmSearch
+ '
+ Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
+ Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+ Me.ClientSize = New System.Drawing.Size(1220, 701)
+ Me.Controls.Add(Me.LayoutControl1)
+ Me.Controls.Add(Me.NavBarControl1)
+ Me.Controls.Add(Me.RibbonStatusBar1)
+ Me.Controls.Add(Me.RibbonControl1)
+ Me.Name = "frmSearch"
+ Me.Ribbon = Me.RibbonControl1
+ Me.StatusBar = Me.RibbonStatusBar1
+ Me.Text = "Search"
+ CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.NavBarControl1.ResumeLayout(False)
+ Me.NavBarGroupControlContainer1.ResumeLayout(False)
+ CType(Me.ImageListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.LayoutControl1.ResumeLayout(False)
+ CType(Me.textEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.textEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.textEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.textEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.textEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlGroup4, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.layoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.layoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.layoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.layoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.layoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
+ Me.ResumeLayout(False)
+ Me.PerformLayout()
+
+ End Sub
+
+ Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl
+ Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
+ Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
+ Friend WithEvents NavBarControl1 As DevExpress.XtraNavBar.NavBarControl
+ Friend WithEvents NavBarGroup1 As DevExpress.XtraNavBar.NavBarGroup
+ Friend WithEvents NavBarGroupControlContainer1 As DevExpress.XtraNavBar.NavBarGroupControlContainer
+ Friend WithEvents RibbonPageCategory1 As DevExpress.XtraBars.Ribbon.RibbonPageCategory
+ Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
+ Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+ Friend WithEvents ImageListBoxControl1 As DevExpress.XtraEditors.ImageListBoxControl
+ Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+ Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
+ Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl
+ Friend WithEvents textEdit1 As DevExpress.XtraEditors.TextEdit
+ Friend WithEvents textEdit2 As DevExpress.XtraEditors.TextEdit
+ Friend WithEvents textEdit3 As DevExpress.XtraEditors.TextEdit
+ Friend WithEvents textEdit4 As DevExpress.XtraEditors.TextEdit
+ Friend WithEvents textEdit5 As DevExpress.XtraEditors.TextEdit
+ Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup
+ Friend WithEvents LayoutControlGroup4 As DevExpress.XtraLayout.LayoutControlGroup
+ Friend WithEvents layoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents layoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents layoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents layoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents layoutControlItem5 As DevExpress.XtraLayout.LayoutControlItem
+End Class
diff --git a/EDMI_ClientSuite/frmInbox.resx b/EDMI_ClientSuite/frmSearch.resx
similarity index 66%
rename from EDMI_ClientSuite/frmInbox.resx
rename to EDMI_ClientSuite/frmSearch.resx
index 1af7de15..c43b3af1 100644
--- a/EDMI_ClientSuite/frmInbox.resx
+++ b/EDMI_ClientSuite/frmSearch.resx
@@ -117,4 +117,45 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAmdEVYdFRpdGxlAEZpbmQ7QmFycztSaWJib247U3Rh
+ bmRhcmQ7U2VhcmNou2WcCAAAAHBJREFUOE+1jtENgDAIRLugaziIU7kdckYIVKhE68dLw931oBGRsmw7
+ CRUduCELZjoIQzac6UJfsPZBOzOnL3/AnIIupDx5IN0+wF2RbrgY+ragul3QK/4rgMmv4DxmfsENmELk
+ A3jfC2zwDaFYh9oB/j2jilUn/gYAAAAASUVORK5CYII=
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAmdEVYdFRpdGxlAEZpbmQ7QmFycztSaWJib247U3Rh
+ bmRhcmQ7U2VhcmNou2WcCAAAALlJREFUWEft0FEOAiEMhOG9oNfwIJ7K22FqICnjD5aIbDQ8fA9MprXu
+ kVI6FYYrYbgShupyuydBnZeedgiGKro42vMwVNHF0Z6HYaEL1WiPYFjkBVe/zJMeec6WHsGw8EsafI/s
+ A374AFnUEu763R6GJg/2/n1U9ytgaPzwh753gHRbxg6Q4en096qHycUZn17hl6gexpcn+7MDGnM9+4B9
+ wD5g6IC3Zs1VD0NDZNZc9TgDhithuE46Hq7c+XFU2QSKAAAAAElFTkSuQmCC
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAARdEVYdFRpdGxlAEV4cG9ydDtTYXZlRtSeMQAAAH5J
+ REFUOE+9zjEOgCAMQFHO6wEcSTyDA0dgdHTibLU1tjZNBdTo8CIC/SEAwCvu5h2ymIelIEC0pq+Hz4oX
+ sJc03pOz3wOsO1DTDHT5NMBPFWNOWtT/TwKAJNIboCFrj3gB6ypAog6sZrAVmND5ghq6qMgwcQcsvnyQ
+ 4TGnsAGFnInIUes/lQAAAABJRU5ErkJggg==
+
+
+
+
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAARdEVYdFRpdGxlAEV4cG9ydDtTYXZlRtSeMQAAAURJ
+ REFUWEfdlsFpw0AQRd2KKzH45FpSgI8B1+CDStAxdaSPgMtQ5guv2Pn6Y63kZQU+PMLM7Mx/BGx8GIZh
+ V2SzJbLZEtlsyaxx//o5Gb/GkIF+Iu+/gt/i5onzXAHs0SNbStQQAA/OcwUQS6BEgOfyLee5AqglIx2P
+ 5oDn8i3nuQKoJSMdj+aA5/It57kCqCUjHY/mgOfyLee5AqglIx2P5orPFVjD7BbnuQKopZpwniuAWqoJ
+ 57kCqKWacJ4rAC2cDfTe4WjcjE0CfOwl175TfOOvzUcJmjURQOgkkfVHWglMEkxLASlRWyAPi3ASewiA
+ SWIvATBKLAlccLgUCijhtiSwhrUC40dSCfzR4VLWCEzfB0oA/3b1y3iJUgH3ZaQENpMfzgjDwUzgHfj4
+ kzAcyENbUQFGGA7koa2oACMMv/bd4R8cYf1FvaRMggAAAABJRU5ErkJggg==
+
+
\ No newline at end of file
diff --git a/EDMI_ClientSuite/frmSearch.vb b/EDMI_ClientSuite/frmSearch.vb
new file mode 100644
index 00000000..22d1c979
--- /dev/null
+++ b/EDMI_ClientSuite/frmSearch.vb
@@ -0,0 +1,17 @@
+Imports DevExpress.XtraEditors.Controls
+
+Public Class frmSearch
+ Private Sub frmSearch_Load(sender As Object, e As EventArgs) Handles Me.Load
+
+ Dim oList As New List(Of String) From {"Marvin", "Marlon", "Annette", "Jan", "Jonathan", "Vladimir", "Armin"}
+
+ For Each oMember In oList
+ Dim oItem As New ImageListBoxItem(oMember, oMember)
+
+ ImageListBoxControl1.Items.Add(oItem)
+ Next
+
+
+
+ End Sub
+End Class
\ No newline at end of file
diff --git a/Modules.Logging/Logging.vbproj b/Modules.Logging/Logging.vbproj
index 037ea288..50b39156 100644
--- a/Modules.Logging/Logging.vbproj
+++ b/Modules.Logging/Logging.vbproj
@@ -89,6 +89,7 @@
Settings.settings
True
+
diff --git a/Modules.Logging/TraceListener.vb b/Modules.Logging/TraceListener.vb
new file mode 100644
index 00000000..3cd5c7d3
--- /dev/null
+++ b/Modules.Logging/TraceListener.vb
@@ -0,0 +1,249 @@
+Imports System
+Imports System.Configuration
+Imports System.Diagnostics
+Imports System.Globalization
+Imports System.IO
+Imports System.Security.Permissions
+Imports System.Text.RegularExpressions
+
+
+Public Class RollingXmlWriterTraceListener
+ Inherits XmlWriterTraceListener
+
+ Private Shared ReadOnly LogFileNumberCaptureName As String = "LogFileNumber"
+ Private attributesLoaded As Boolean = False
+ Private logfileSuffixExpression As Regex = New Regex("_(?<" & LogFileNumberCaptureName & ">\d*)\.", RegexOptions.Compiled)
+ Private currentFileSuffixNumber As Integer = 0
+ Private _maxTraceFileSize As Long = 128 * 1024 * 1024
+ Private basicTraceFileName As String = String.Empty
+
+ Public Sub New(ByVal filename As String)
+ MyBase.New(filename)
+ Me.basicTraceFileName = filename
+ Me.currentFileSuffixNumber = Me.GetTraceFileNumber()
+ Me.StartNewTraceFile()
+ End Sub
+
+ Public Sub New(ByVal filename As String, ByVal name As String)
+ MyBase.New(filename, name)
+ Me.basicTraceFileName = filename
+ Me.StartNewTraceFile()
+ End Sub
+
+ Public ReadOnly Property CurrentTraceFileName As String
+ Get
+ Return Path.Combine(Path.GetDirectoryName(Me.basicTraceFileName), Path.GetFileNameWithoutExtension(Me.basicTraceFileName) & "_" & Me.currentFileSuffixNumber.ToString().PadLeft(4, "0"c) & Path.GetExtension(Me.basicTraceFileName))
+ End Get
+ End Property
+
+ Public Property MaxTraceFileSize As Long
+ Get
+
+ If Not Me.attributesLoaded Then
+ Me.LoadAttributes()
+ End If
+
+ Return Me._maxTraceFileSize
+ End Get
+ Set(ByVal value As Long)
+
+ If Not Me.attributesLoaded Then
+ Me.LoadAttributes()
+ End If
+
+ Me._maxTraceFileSize = value
+ End Set
+ End Property
+
+ Protected ReadOnly Property IsRollingConditionReached As Boolean
+ Get
+ Dim streamWriter As StreamWriter = CType(Me.Writer, StreamWriter)
+ Dim fileStream As FileStream = CType(streamWriter.BaseStream, FileStream)
+ Dim traceFileName As String = fileStream.Name
+ Dim traceFileInfo As FileInfo = New FileInfo(traceFileName)
+
+ If traceFileInfo.Length > Me._maxTraceFileSize Then
+ Return True
+ Else
+ Return False
+ End If
+ End Get
+ End Property
+
+ Public Overrides Sub Fail(ByVal message As String)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.Fail(message)
+ End Sub
+
+ Public Overrides Sub Fail(ByVal message As String, ByVal detailMessage As String)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.Fail(message, detailMessage)
+ End Sub
+
+ Public Overrides Sub TraceData(ByVal eventCache As TraceEventCache, ByVal source As String, ByVal eventType As TraceEventType, ByVal id As Integer, ByVal data As Object)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.TraceData(eventCache, source, eventType, id, data)
+ End Sub
+
+ Public Overrides Sub TraceData(ByVal eventCache As TraceEventCache, ByVal source As String, ByVal eventType As TraceEventType, ByVal id As Integer, ParamArray data As Object())
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.TraceData(eventCache, source, eventType, id, data)
+ End Sub
+
+ Public Overrides Sub TraceEvent(ByVal eventCache As TraceEventCache, ByVal source As String, ByVal eventType As TraceEventType, ByVal id As Integer)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.TraceEvent(eventCache, source, eventType, id)
+ End Sub
+
+ Public Overrides Sub TraceEvent(ByVal eventCache As TraceEventCache, ByVal source As String, ByVal eventType As TraceEventType, ByVal id As Integer, ByVal message As String)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.TraceEvent(eventCache, source, eventType, id, message)
+ End Sub
+
+ Public Overrides Sub TraceEvent(ByVal eventCache As TraceEventCache, ByVal source As String, ByVal eventType As TraceEventType, ByVal id As Integer, ByVal format As String, ParamArray args As Object())
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.TraceEvent(eventCache, source, eventType, id, format, args)
+ End Sub
+
+ Public Overrides Sub TraceTransfer(ByVal eventCache As TraceEventCache, ByVal source As String, ByVal id As Integer, ByVal message As String, ByVal relatedActivityId As Guid)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.TraceTransfer(eventCache, source, id, message, relatedActivityId)
+ End Sub
+
+ Public Overrides Sub Write(ByVal o As Object)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.Write(o)
+ End Sub
+
+ Public Overrides Sub Write(ByVal o As Object, ByVal category As String)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.Write(o, category)
+ End Sub
+
+ Public Overrides Sub Write(ByVal message As String)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.Write(message)
+ End Sub
+
+ Public Overrides Sub Write(ByVal message As String, ByVal category As String)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.Write(message, category)
+ End Sub
+
+ Public Overrides Sub WriteLine(ByVal o As Object)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.WriteLine(o)
+ End Sub
+
+ Public Overrides Sub WriteLine(ByVal o As Object, ByVal category As String)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.WriteLine(o, category)
+ End Sub
+
+ Public Overrides Sub WriteLine(ByVal message As String)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.WriteLine(message)
+ End Sub
+
+ Public Overrides Sub WriteLine(ByVal message As String, ByVal category As String)
+ If Me.IsRollingConditionReached Then
+ Me.StartNewTraceFile()
+ End If
+
+ MyBase.WriteLine(message, category)
+ End Sub
+
+ Protected Overrides Function GetSupportedAttributes() As String()
+ Return New String(0) {"MaxTraceFileSize"}
+ End Function
+
+ Private Sub StartNewTraceFile()
+ Dim streamWriter As StreamWriter = CType(Me.Writer, StreamWriter)
+ Dim fileStream As FileStream = CType(streamWriter.BaseStream, FileStream)
+ fileStream.Close()
+ Me.currentFileSuffixNumber += 1
+ Me.Writer = New StreamWriter(New FileStream(Me.CurrentTraceFileName, FileMode.Create))
+ End Sub
+
+ Private Function GetTraceFileNumber() As Integer
+ Dim directoryName As String = Path.GetDirectoryName(Me.basicTraceFileName)
+ Dim basicTraceFileNameWithoutExtension As String = Path.GetFileNameWithoutExtension(Me.basicTraceFileName)
+ Dim basicTraceFileNameExtension As String = Path.GetExtension(Me.basicTraceFileName)
+ Dim existingLogFiles As String() = Directory.GetFiles(directoryName, basicTraceFileNameWithoutExtension & "*")
+ Dim highestNumber As Integer = -1
+
+ For Each existingLogFile As String In existingLogFiles
+ Dim match As Match = Me.logfileSuffixExpression.Match(existingLogFile)
+
+ If match IsNot Nothing Then
+ Dim tempInt As Integer
+
+ If match.Groups.Count >= 1 AndAlso Integer.TryParse(match.Groups(LogFileNumberCaptureName).Value, tempInt) AndAlso tempInt >= highestNumber Then
+ highestNumber = tempInt
+ End If
+ End If
+ Next
+
+ Return highestNumber
+ End Function
+
+ Private Sub LoadAttributes()
+ If Attributes.ContainsKey("MaxTraceFileSize") AndAlso Not String.IsNullOrEmpty(Attributes("MaxTraceFileSize")) Then
+ Dim tempLong As Long = 0
+ Dim attributeValue As String = Attributes("MaxTraceFileSize")
+
+ If Long.TryParse(attributeValue, tempLong) Then
+ Me._maxTraceFileSize = Long.Parse(Attributes("MaxTraceFileSize"), NumberFormatInfo.InvariantInfo)
+ Else
+ Throw New ConfigurationErrorsException(String.Format("Trace listener {0} has an unparseable configuration attribute ""MaxTraceFileSize"". The value ""{1}"" cannot be parsed to a long value.", Me.Name, attributeValue))
+ End If
+ End If
+
+ Me.attributesLoaded = True
+ End Sub
+End Class