From 4447844b9fb883a64447d285caa0095bb01ca5d8 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 5 Mar 2019 16:25:33 +0100 Subject: [PATCH] add Inbox Form --- EDMI_ClientSuite/ClassCommonCommands.vb | 15 ++ EDMI_ClientSuite/ClientSuite.vbproj | 15 ++ EDMI_ClientSuite/My Project/licenses.licx | 14 +- EDMI_ClientSuite/frmDocTest.vb | 12 +- EDMI_ClientSuite/frmInbox.Designer.vb | 185 ++++++++++++++++++++++ EDMI_ClientSuite/frmInbox.resx | 120 ++++++++++++++ EDMI_ClientSuite/frmInbox.vb | 15 ++ EDMI_ClientSuite/frmMain.Designer.vb | 61 ++++--- EDMI_ClientSuite/frmMain.resx | 62 +++++--- EDMI_ClientSuite/frmMain.vb | 7 + 10 files changed, 447 insertions(+), 59 deletions(-) create mode 100644 EDMI_ClientSuite/frmInbox.Designer.vb create mode 100644 EDMI_ClientSuite/frmInbox.resx create mode 100644 EDMI_ClientSuite/frmInbox.vb diff --git a/EDMI_ClientSuite/ClassCommonCommands.vb b/EDMI_ClientSuite/ClassCommonCommands.vb index 004208d5..8c95268d 100644 --- a/EDMI_ClientSuite/ClassCommonCommands.vb +++ b/EDMI_ClientSuite/ClassCommonCommands.vb @@ -1,4 +1,5 @@ Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.EDMIFileOps.EDMIServiceReference Public Class ClassCommonCommands Private _LogConfig As LogConfig @@ -63,4 +64,18 @@ Public Class ClassCommonCommands End Try End Function + Public Async Function FNICM_NEW_DOC_VALUE(DocumentId As Int64, Syskey As String, LanguageKey As String, Value As String) As Task(Of ScalarResult) + Try + Dim oSQL = $"SELECT FNICM_NEW_DOC_VALUE({DocumentId}, '{Syskey}', '{LanguageKey}', '{My.Application.User.UserName}', '{Value}') FROM RDB$DATABASE;" + Dim oRequest = Await My.Channel.CreateDatabaseRequestAsync($"Delete Record", False) + Dim oResult = Await My.Channel.ReturnScalarAsync(oSQL) + + Await My.Channel.CloseDatabaseRequestAsync() + + Return oResult + Catch ex As Exception + _Logger.Error(ex) + Throw ex + End Try + End Function End Class diff --git a/EDMI_ClientSuite/ClientSuite.vbproj b/EDMI_ClientSuite/ClientSuite.vbproj index a4e4dcc2..b7a28bb7 100644 --- a/EDMI_ClientSuite/ClientSuite.vbproj +++ b/EDMI_ClientSuite/ClientSuite.vbproj @@ -74,7 +74,9 @@ + + ..\packages\FirebirdSql.Data.FirebirdClient.6.4.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll @@ -186,6 +188,12 @@ Form + + frmInbox.vb + + + Form + frmMain.vb @@ -285,6 +293,9 @@ frmFileTest.vb + + frmInbox.vb + frmMain.vb @@ -397,6 +408,10 @@ {903b2d7d-3b80-4be9-8713-7447b704e1b0} Logging + + {A8C3F298-76AB-4359-AB3C-986E313B4336} + DDEDMService + diff --git a/EDMI_ClientSuite/My Project/licenses.licx b/EDMI_ClientSuite/My Project/licenses.licx index 984bff31..511dc5c8 100644 --- a/EDMI_ClientSuite/My Project/licenses.licx +++ b/EDMI_ClientSuite/My Project/licenses.licx @@ -1,12 +1,14 @@ -DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraDataLayout.DataLayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraTabbedMdi.XtraTabbedMdiManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Navigation.OfficeNavigationBar, DevExpress.XtraBars.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/EDMI_ClientSuite/frmDocTest.vb b/EDMI_ClientSuite/frmDocTest.vb index ad65684e..7701b15f 100644 --- a/EDMI_ClientSuite/frmDocTest.vb +++ b/EDMI_ClientSuite/frmDocTest.vb @@ -1,6 +1,8 @@ Imports DevExpress.XtraGrid Public Class frmDocTest + Private _CommonCommands As ClassCommonCommands + Private Sub DocTest_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try Dim oControlPatcher = New ClassControlPatcher(Of GridControl)(Me) @@ -8,6 +10,8 @@ Public Class frmDocTest ProcessContainer(AddressOf ClassGridControl.DefaultGridSettings). ProcessContainer(AddressOf ClassGridControl.ReadOnlyGridSettings) + _CommonCommands = New ClassCommonCommands(My.LogConfig) + Dim oSQL = "SELECT * FROM VWICM_DOC_METADATA_DE" My.Channel.CreateDatabaseRequest("Load Doc Values", True) @@ -32,15 +36,11 @@ Public Class frmDocTest End Try End Sub - Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Private Async Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Dim oDocId As Int64 = Int64.Parse(txtDocId.Text) Dim oValue As String = txtDoctype.Text Dim oSyskey As String = "001-DOCTYPE" - - Dim oSQL = $"SELECT FNICM_NEW_DOC_VALUE({oDocId}, '{oSyskey}', '{My.Application.User.Language}', '{My.Application.User.UserName}', '{oValue}') FROM RDB$DATABASE;" - My.Channel.CreateDatabaseRequest("Save Doc Value", True) - - Dim oResult = My.Channel.ReturnScalar(oSQL) + Dim oResult = Await _CommonCommands.FNICM_NEW_DOC_VALUE(oDocId, oSyskey, My.Application.User.Language, oValue) If Not oResult.OK Then MsgBox(oResult.ErrorMessage) diff --git a/EDMI_ClientSuite/frmInbox.Designer.vb b/EDMI_ClientSuite/frmInbox.Designer.vb new file mode 100644 index 00000000..43da3e39 --- /dev/null +++ b/EDMI_ClientSuite/frmInbox.Designer.vb @@ -0,0 +1,185 @@ + _ +Partial Class frmInbox + Inherits BaseRibbonForm + + 'Form overrides dispose to clean up the component list. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) + End Sub + + 'Required by the Windows Form Designer + Private components As System.ComponentModel.IContainer + + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ + Private Sub InitializeComponent() + Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.NavBarControl1 = New DevExpress.XtraNavBar.NavBarControl() + Me.NavBarGroup1 = New DevExpress.XtraNavBar.NavBarGroup() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.NavBarGroupControlContainer1 = New DevExpress.XtraNavBar.NavBarGroupControlContainer() + Me.TreeList1 = New DevExpress.XtraTreeList.TreeList() + Me.TreeListColumn1 = New DevExpress.XtraTreeList.Columns.TreeListColumn() + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.NavBarControl1.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.NavBarGroupControlContainer1.SuspendLayout() + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'RibbonControl + ' + Me.RibbonControl.ExpandCollapseItem.Id = 0 + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem}) + Me.RibbonControl.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl.MaxItemId = 1 + Me.RibbonControl.Name = "RibbonControl" + Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl.Size = New System.Drawing.Size(1110, 146) + Me.RibbonControl.StatusBar = Me.RibbonStatusBar + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "RibbonPage1" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + ' + 'RibbonStatusBar + ' + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 630) + Me.RibbonStatusBar.Name = "RibbonStatusBar" + Me.RibbonStatusBar.Ribbon = Me.RibbonControl + Me.RibbonStatusBar.Size = New System.Drawing.Size(1110, 21) + ' + 'NavBarControl1 + ' + 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.Location = New System.Drawing.Point(0, 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, 484) + Me.NavBarControl1.TabIndex = 2 + Me.NavBarControl1.Text = "NavBarControl1" + ' + 'NavBarGroup1 + ' + Me.NavBarGroup1.Caption = "Inbox" + Me.NavBarGroup1.ControlContainer = Me.NavBarGroupControlContainer1 + Me.NavBarGroup1.Expanded = True + Me.NavBarGroup1.GroupClientHeight = 369 + Me.NavBarGroup1.GroupStyle = DevExpress.XtraNavBar.NavBarGroupStyle.ControlContainer + Me.NavBarGroup1.Name = "NavBarGroup1" + ' + 'GridControl1 + ' + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridControl1.Location = New System.Drawing.Point(250, 146) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.MenuManager = Me.RibbonControl + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(860, 484) + Me.GridControl1.TabIndex = 3 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'NavBarGroupControlContainer1 + ' + Me.NavBarGroupControlContainer1.Appearance.BackColor = System.Drawing.SystemColors.Control + 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.TabIndex = 0 + ' + 'TreeList1 + ' + Me.TreeList1.Columns.AddRange(New DevExpress.XtraTreeList.Columns.TreeListColumn() {Me.TreeListColumn1}) + Me.TreeList1.Cursor = System.Windows.Forms.Cursors.Default + Me.TreeList1.CustomizationFormBounds = New System.Drawing.Rectangle(-252, 456, 252, 236) + Me.TreeList1.Dock = System.Windows.Forms.DockStyle.Fill + Me.TreeList1.Location = New System.Drawing.Point(0, 0) + Me.TreeList1.Name = "TreeList1" + Me.TreeList1.BeginUnboundLoad() + Me.TreeList1.AppendNode(New Object() {"Todos"}, -1) + Me.TreeList1.AppendNode(New Object() {"Validierungen"}, 0) + Me.TreeList1.EndUnboundLoad() + Me.TreeList1.OptionsView.ShowFirstLines = True + Me.TreeList1.OptionsView.ShowHorzLines = True + Me.TreeList1.OptionsView.ShowIndicator = True + Me.TreeList1.OptionsView.ShowVertLines = True + Me.TreeList1.Size = New System.Drawing.Size(250, 403) + Me.TreeList1.TabIndex = 0 + Me.TreeList1.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView + ' + 'TreeListColumn1 + ' + Me.TreeListColumn1.Caption = "TreeListColumn1" + Me.TreeListColumn1.FieldName = "TreeListColumn1" + Me.TreeListColumn1.Name = "TreeListColumn1" + Me.TreeListColumn1.Visible = True + Me.TreeListColumn1.VisibleIndex = 0 + ' + 'frmInbox + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1110, 651) + Me.Controls.Add(Me.GridControl1) + Me.Controls.Add(Me.NavBarControl1) + Me.Controls.Add(Me.RibbonStatusBar) + Me.Controls.Add(Me.RibbonControl) + Me.Name = "frmInbox" + Me.Ribbon = Me.RibbonControl + Me.StatusBar = Me.RibbonStatusBar + Me.Text = "frmInbox" + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.NavBarControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.NavBarControl1.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.NavBarGroupControlContainer1.ResumeLayout(False) + CType(Me.TreeList1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents NavBarControl1 As DevExpress.XtraNavBar.NavBarControl + Friend WithEvents NavBarGroup1 As DevExpress.XtraNavBar.NavBarGroup + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents NavBarGroupControlContainer1 As DevExpress.XtraNavBar.NavBarGroupControlContainer + Friend WithEvents TreeList1 As DevExpress.XtraTreeList.TreeList + Friend WithEvents TreeListColumn1 As DevExpress.XtraTreeList.Columns.TreeListColumn +End Class diff --git a/EDMI_ClientSuite/frmInbox.resx b/EDMI_ClientSuite/frmInbox.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/EDMI_ClientSuite/frmInbox.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/EDMI_ClientSuite/frmInbox.vb b/EDMI_ClientSuite/frmInbox.vb new file mode 100644 index 00000000..c46d9095 --- /dev/null +++ b/EDMI_ClientSuite/frmInbox.vb @@ -0,0 +1,15 @@ +Public Class frmInbox + + + Private Sub frmInbox_Load(sender As Object, e As EventArgs) Handles Me.Load + Dim oCommonCommands As New ClassCommonCommands(My.LogConfig) + + + 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 7d381f87..6fdb980d 100644 --- a/EDMI_ClientSuite/frmMain.Designer.vb +++ b/EDMI_ClientSuite/frmMain.Designer.vb @@ -43,6 +43,7 @@ Partial Class frmMain Me.LabelServiceOnline = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonUserManager = New DevExpress.XtraBars.BarButtonItem() 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() @@ -63,7 +64,7 @@ Partial Class frmMain Me.DockPanelProcessManager = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.ProcessManagerWidget = New DigitalData.GUIs.ClientSuite.ProcessManagerWidget() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonInbox = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DocumentManager, System.ComponentModel.ISupportInitialize).BeginInit() @@ -80,15 +81,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.LabelServiceOffline, Me.BarButtonItem3}) + 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.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 22 + 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.Size = New System.Drawing.Size(1139, 143) + Me.RibbonControl.Size = New System.Drawing.Size(1139, 146) Me.RibbonControl.StatusBar = Me.RibbonStatusBar ' 'MainMenu @@ -235,6 +236,14 @@ Partial Class frmMain Me.LabelServiceOffline.ImageOptions.Image = CType(resources.GetObject("LabelServiceOffline.ImageOptions.Image"), System.Drawing.Image) Me.LabelServiceOffline.Name = "LabelServiceOffline" ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "DocTest" + Me.BarButtonItem3.Id = 21 + Me.BarButtonItem3.ImageOptions.Image = CType(resources.GetObject("BarButtonItem3.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem3.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPageStart ' Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup3}) @@ -244,6 +253,7 @@ Partial Class frmMain 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonDashboard) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonInbox) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "RibbonPageGroup1" ' @@ -299,10 +309,10 @@ Partial Class frmMain Me.RibbonStatusBar.ItemLinks.Add(Me.LabelCurrentLanguage) Me.RibbonStatusBar.ItemLinks.Add(Me.LabelServiceOnline) Me.RibbonStatusBar.ItemLinks.Add(Me.LabelServiceOffline) - Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 546) + Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 556) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl - Me.RibbonStatusBar.Size = New System.Drawing.Size(1139, 31) + Me.RibbonStatusBar.Size = New System.Drawing.Size(1139, 21) ' 'DocumentManager ' @@ -327,11 +337,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, 143) + 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, 403) + Me.panelContainer1.Size = New System.Drawing.Size(346, 410) Me.panelContainer1.Text = "panelContainer1" ' 'DockPanelGlobix @@ -342,17 +352,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(346, 205) + Me.DockPanelGlobix.OriginalSize = New System.Drawing.Size(346, 202) Me.DockPanelGlobix.SavedSizeFactor = 0R - Me.DockPanelGlobix.Size = New System.Drawing.Size(346, 202) + Me.DockPanelGlobix.Size = New System.Drawing.Size(346, 206) Me.DockPanelGlobix.Text = "GLOBIX" ' 'DockPanel1_Container ' Me.DockPanel1_Container.Controls.Add(Me.Label1) - Me.DockPanel1_Container.Location = New System.Drawing.Point(5, 23) + 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, 174) + Me.DockPanel1_Container.Size = New System.Drawing.Size(337, 163) Me.DockPanel1_Container.TabIndex = 0 ' 'Label1 @@ -361,7 +371,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, 174) + 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 @@ -371,20 +381,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, 202) + 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, 205) + Me.DockPanelProcessManager.OriginalSize = New System.Drawing.Size(346, 201) Me.DockPanelProcessManager.SavedSizeFactor = 0R - Me.DockPanelProcessManager.Size = New System.Drawing.Size(346, 201) + 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, 23) + 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, 174) + Me.DockPanel2_Container.Size = New System.Drawing.Size(337, 162) Me.DockPanel2_Container.TabIndex = 0 ' 'ProcessManagerWidget @@ -393,16 +403,16 @@ 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, 174) + Me.ProcessManagerWidget.Size = New System.Drawing.Size(337, 162) Me.ProcessManagerWidget.TabIndex = 0 ' - 'BarButtonItem3 + 'BarButtonInbox ' - Me.BarButtonItem3.Caption = "DocTest" - Me.BarButtonItem3.Id = 21 - Me.BarButtonItem3.ImageOptions.Image = CType(resources.GetObject("BarButtonItem3.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem3.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem3.Name = "BarButtonItem3" + 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" ' 'frmMain ' @@ -475,4 +485,5 @@ 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 End Class diff --git a/EDMI_ClientSuite/frmMain.resx b/EDMI_ClientSuite/frmMain.resx index 4e3e31d2..c4dc9abd 100644 --- a/EDMI_ClientSuite/frmMain.resx +++ b/EDMI_ClientSuite/frmMain.resx @@ -243,22 +243,21 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAPXRFWHRUaXRsZQBOZXc7UGFn - ZTtCYXJzO1JpYmJvbjtTdGFuZGFyZDtJdGVtO0JsYW5rO0RlZmF1bHQ7RW1wdHk7EwRS7QAAAEtJREFU - OE9j+P//P0UYzmhpafmPB/+D0sbImkEYxQB8ACTf19d3F90QkgwAgl/ohpBkADIGAtIMQAajBowaAAI4 - DSAFYxhAHv7PAACenFKy9QHhCAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA9dEVYdFRpdGxlAE5ldztQYWdlO0JhcnM7UmliYm9u + O1N0YW5kYXJkO0l0ZW07Qmxhbms7RGVmYXVsdDtFbXB0eTsTBFLtAAAAS0lEQVQ4T2P4//8/RRjOaGlp + +Y8H/4PSxsiaQRjFAHwAJN/X13cX3RCSDACCX+iGkGQAMgYC0gxABqMGjBoAAjgNIAVjGEAe/s8AAJ6c + UrL1AeEIAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAPXRFWHRUaXRsZQBOZXc7UGFn - ZTtCYXJzO1JpYmJvbjtTdGFuZGFyZDtJdGVtO0JsYW5rO0RlZmF1bHQ7RW1wdHk7EwRS7QAAAKpJREFU - WEftkkEKhTAMRD2f5+q2R+jRuhL+IXQRM2DhWwdRkXGTwEM6NslbdDCzT6GhEhoqoaESGiqhIUgp2U0m - Z3TQe4DtADQE3uSf64X7OeellDL6sZ+1O/9DQ/BEoNZKJWQCKCYhFUD1EnIB1CYxQ+ITAVST8H+Hh9mg - IXgicMLPr9A9NARofKu2WXQPDUEIhEAIhEAIhEAIoOlN+vkNGiqhoRIa6rBhBTJ6HSbL46IIAAAAAElF - TkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAA9dEVYdFRpdGxlAE5ldztQYWdlO0JhcnM7UmliYm9u + O1N0YW5kYXJkO0l0ZW07Qmxhbms7RGVmYXVsdDtFbXB0eTsTBFLtAAAAqklEQVRYR+2SQQqFMAxEPZ/n + 6rZH6NG6Ev4hdBEzYOFbB1GRcZPAQzo2yVt0MLNPoaESGiqhoRIaKqEhSCnZTSZndNB7gO0ANATe5J/r + hfs556WUMvqxn7U7/0ND8ESg1kolZAIoJiEVQPUScgHUJjFD4hMBVJPwf4eH2aAheCJwws+v0D00BGh8 + q7ZZdA8NQQiEQAiEQAiEQAig6U36+Q0aKqGhEhrqsGEFMnodJsvjoggAAAAASUVORK5CYII= @@ -412,21 +411,40 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAFnRFWHRUaXRsZQBUZXh0O1Bh - Z2U7UmVwb3J0dmFhAAAAAFVJREFUOE9j+P//P0UYzmhpafmPB/+D0sbImkEYxQB8ACTf19d3F90QkgwA - gl/ohpBkADIGAtIMQAZ4DfBt2oEXg8CoC2jtAmIA7QwgBWMYQB7+zwAAuicvos+uzscAAAAASUVORK5C - YII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAFRleHQ7UGFnZTtSZXBvcnR2YWEA + AAAAVUlEQVQ4T2P4//8/RRjOaGlp+Y8H/4PSxsiaQRjFAHwAJN/X13cX3RCSDACCX+iGkGQAMgYC0gxA + BngN8G3agReDwKgLaO0CYgDtDCAFYxhAHv7PAAC6Jy+iz67OxwAAAABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAWdEVYdFRpdGxlAFRleHQ7UGFnZTtSZXBvcnR2YWEA + AAAAu0lEQVRYR+2SQQqDMBREPZ/QS5Vsc4Tco5fJSugh2kX6BwxoHEpNZSzlDzwko0keH4dSyqnQUgkt + ldBSCS1BCKHsZDJGA3s3sDsALYFtssfnwfcxxmdKabRle9ZqvYSWoEcg50wlZAIIk5AKIK2EXACZJR6Q + OEUAqRL2bvNjVmgJegTecLdP6D20BNh4VOaz6D20BD8ncLnedrGMT8An4BPwCfzHBL6JC3QLHEl7foWW + SmiphJZKaKmjDC/fWMVvGNRzeQAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJHRFWHRUaXRsZQBDb21tZW50 + O1Rvb2x0aXA7SGludDtUaXA7Q2xvdWTTwdvJAAAAYUlEQVQ4T2P4//8/RZjBt2lHAxD/JxM3gAzAJkE0 + Ho4GwEIXHxsZU98AUvEwMYCypAwNWTCNjIFivkgKkTFIHK4OrBlZAIah4uiGgDWDMEwdiiZkDFMI1YSi + GYQh6v4zAAANA4rK4wvslQAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAFnRFWHRUaXRsZQBUZXh0O1Bh - Z2U7UmVwb3J0dmFhAAAAALtJREFUWEftkkEKgzAURD2f0EuVbHOE3KOXyUroIdpF+gcMaBxKTWUs5Q88 - JKNJHh+HUsqp0FIJLZXQUgktQQih7GQyRgN7N7A7AC2BbbLH58H3McZnSmm0ZXvWar2ElqBHIOdMJWQC - CJOQCiCthFwAmSUekDhFAKkS9m7zY1ZoCXoE3nC3T+g9tATYeFTms+g9tAQ/J3C53naxjE/AJ+AT8An8 - xwS+iQt0CxxJe36FlkpoqYSWSmipowwv31jFbxjUc3kAAAAASUVORK5CYII= + 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 2731507e..91df07b8 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -199,4 +199,11 @@ 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 { + .MdiParent = DocumentManager.MdiParent + } + oForm.Show() + End Sub End Class \ No newline at end of file