diff --git a/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb b/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb index 10da6c2a..4dce2653 100644 --- a/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb +++ b/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb @@ -36,7 +36,6 @@ Partial Class frmUserManager Me.OfficeNavigationBar1 = New DevExpress.XtraBars.Navigation.OfficeNavigationBar() Me.NavbarUser2Group = New DevExpress.XtraBars.Navigation.NavigationBarItem() Me.NavbarGroup2Group = New DevExpress.XtraBars.Navigation.NavigationBarItem() - Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.OfficeNavigationBar1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -44,7 +43,7 @@ Partial Class frmUserManager 'RibbonControl ' Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonUserEdit, Me.BarButtonGroupEdit, Me.BarButtonAssign, Me.BarButtonItem1, Me.BarButtonRefresh, Me.BarStaticItem1}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonUserEdit, Me.BarButtonGroupEdit, Me.BarButtonAssign, Me.BarButtonItem1, Me.BarButtonRefresh}) Me.RibbonControl.Location = New System.Drawing.Point(0, 0) Me.RibbonControl.MaxItemId = 10 Me.RibbonControl.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always @@ -128,7 +127,6 @@ Partial Class frmUserManager 'RibbonStatusBar ' Me.RibbonStatusBar.HideWhenMerging = DevExpress.Utils.DefaultBoolean.[True] - Me.RibbonStatusBar.ItemLinks.Add(Me.BarStaticItem1) Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 519) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl @@ -167,12 +165,6 @@ Partial Class frmUserManager Me.NavbarGroup2Group.ShowPeekFormOnItemHover = DevExpress.Utils.DefaultBoolean.[True] Me.NavbarGroup2Group.Text = "Gruppenzuordnung" ' - 'BarStaticItem1 - ' - Me.BarStaticItem1.Caption = "test" - Me.BarStaticItem1.Id = 9 - Me.BarStaticItem1.Name = "BarStaticItem1" - ' 'frmUserManager ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -209,5 +201,4 @@ Partial Class frmUserManager Friend WithEvents OfficeNavigationBar1 As DevExpress.XtraBars.Navigation.OfficeNavigationBar Friend WithEvents NavbarUser2Group As DevExpress.XtraBars.Navigation.NavigationBarItem Friend WithEvents NavbarGroup2Group As DevExpress.XtraBars.Navigation.NavigationBarItem - Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem End Class diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index 1d9f4573..64d14405 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -5,6 +5,7 @@ Imports System.IO Imports DigitalData.Modules.Logging Imports DigitalData.Modules.License Imports DevExpress.LookAndFeel +Imports DevExpress.XtraBars.Ribbon Public Class frmMain Private _Logger As Logger @@ -172,4 +173,19 @@ Public Class frmMain My.UIConfigManager.Save() End If End Sub + + ' Manually merge the status bars of the parent and child MDI forms. + Private Sub RibbonControl1_Merge(ByVal sender As System.Object, + ByVal e As RibbonMergeEventArgs) Handles RibbonControl.Merge + Dim parentRRibbon As RibbonControl = TryCast(sender, RibbonControl) + Dim childRibbon As RibbonControl = e.MergedChild + parentRRibbon.StatusBar.MergeStatusBar(childRibbon.StatusBar) + End Sub + + ' Manually unmerge the status bars. + Private Sub RibbonControl1_UnMerge(ByVal sender As System.Object, + ByVal e As RibbonMergeEventArgs) Handles RibbonControl.UnMerge + Dim parentRRibbon As RibbonControl = TryCast(sender, RibbonControl) + parentRRibbon.StatusBar.UnMergeStatusBar() + End Sub End Class \ No newline at end of file