EditForm Tweaks, Other Tweaks

2019-02-25 16:40:52 +01:00
parent e9c08de50d
commit 86ade712c9
8 changed files with 312 additions and 212 deletions
--- a/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb
+++ b/EDMI_ClientSuite/UserManager/frmUserManager.Designer.vb
@@ -20,7 +20,7 @@ Partial Class frmUserManager
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmUserManager))
-        Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.UserRibbon = New DevExpress.XtraBars.Ribbon.RibbonControl()
        Me.BarButtonUserEdit = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonGroupEdit = New DevExpress.XtraBars.BarButtonItem()
        Me.BarButtonAssign = New DevExpress.XtraBars.BarButtonItem()
@@ -32,27 +32,27 @@ Partial Class frmUserManager
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
-        Me.UCUserToGroup = New DigitalData.GUIs.ClientSuite.UserControlAssignment()
-        Me.OfficeNavigationBar1 = New DevExpress.XtraBars.Navigation.OfficeNavigationBar()
+        Me.UserNavbar = New DevExpress.XtraBars.Navigation.OfficeNavigationBar()
        Me.NavbarUser2Group = New DevExpress.XtraBars.Navigation.NavigationBarItem()
        Me.NavbarGroup2Group = New DevExpress.XtraBars.Navigation.NavigationBarItem()
-        Me.UCGroupToGroup = New DigitalData.GUIs.ClientSuite.UserControlAssignment()
-        CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.OfficeNavigationBar1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.ContentPanel = New DevExpress.XtraEditors.PanelControl()
+        CType(Me.UserRibbon, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.UserNavbar, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.ContentPanel, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
-        'RibbonControl
+        'UserRibbon
        '
-        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.RibbonControl.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl.MaxItemId = 10
-        Me.RibbonControl.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always
-        Me.RibbonControl.Name = "RibbonControl"
-        Me.RibbonControl.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryUserManager})
-        Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
-        Me.RibbonControl.Size = New System.Drawing.Size(1070, 146)
-        Me.RibbonControl.StatusBar = Me.RibbonStatusBar
+        Me.UserRibbon.ExpandCollapseItem.Id = 0
+        Me.UserRibbon.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.UserRibbon.ExpandCollapseItem, Me.BarButtonUserEdit, Me.BarButtonGroupEdit, Me.BarButtonAssign, Me.BarButtonItem1, Me.BarButtonRefresh})
+        Me.UserRibbon.Location = New System.Drawing.Point(0, 0)
+        Me.UserRibbon.MaxItemId = 10
+        Me.UserRibbon.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always
+        Me.UserRibbon.Name = "UserRibbon"
+        Me.UserRibbon.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategoryUserManager})
+        Me.UserRibbon.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
+        Me.UserRibbon.Size = New System.Drawing.Size(1070, 146)
+        Me.UserRibbon.StatusBar = Me.RibbonStatusBar
        '
        'BarButtonUserEdit
        '
@@ -131,29 +131,18 @@ Partial Class frmUserManager
        Me.RibbonStatusBar.HideWhenMerging = DevExpress.Utils.DefaultBoolean.[True]
        Me.RibbonStatusBar.Location = New System.Drawing.Point(0, 519)
        Me.RibbonStatusBar.Name = "RibbonStatusBar"
-        Me.RibbonStatusBar.Ribbon = Me.RibbonControl
+        Me.RibbonStatusBar.Ribbon = Me.UserRibbon
        Me.RibbonStatusBar.Size = New System.Drawing.Size(1070, 21)
        '
-        'UCUserToGroup
+        'UserNavbar
        '
-        Me.UCUserToGroup.Location = New System.Drawing.Point(335, 163)
-        Me.UCUserToGroup.Name = "UCUserToGroup"
-        Me.UCUserToGroup.Size = New System.Drawing.Size(391, 271)
-        Me.UCUserToGroup.TabIndex = 0
-        Me.UCUserToGroup.TextAssignedToParent = "Zugeordnete Benutzer zu Gruppe:"
-        Me.UCUserToGroup.TextNotAssignedToParent = "Nicht zugeordnete Benutzer:"
-        Me.UCUserToGroup.TextParentList = "Verfügbare Gruppen:"
-        Me.UCUserToGroup.Visible = False
-        '
-        'OfficeNavigationBar1
-        '
-        Me.OfficeNavigationBar1.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.OfficeNavigationBar1.Items.AddRange(New DevExpress.XtraBars.Navigation.NavigationBarItem() {Me.NavbarUser2Group, Me.NavbarGroup2Group})
-        Me.OfficeNavigationBar1.Location = New System.Drawing.Point(0, 474)
-        Me.OfficeNavigationBar1.Name = "OfficeNavigationBar1"
-        Me.OfficeNavigationBar1.Size = New System.Drawing.Size(1070, 45)
-        Me.OfficeNavigationBar1.TabIndex = 2
-        Me.OfficeNavigationBar1.Text = "OfficeNavigationBar1"
+        Me.UserNavbar.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.UserNavbar.Items.AddRange(New DevExpress.XtraBars.Navigation.NavigationBarItem() {Me.NavbarUser2Group, Me.NavbarGroup2Group})
+        Me.UserNavbar.Location = New System.Drawing.Point(0, 474)
+        Me.UserNavbar.Name = "UserNavbar"
+        Me.UserNavbar.Size = New System.Drawing.Size(1070, 45)
+        Me.UserNavbar.TabIndex = 2
+        Me.UserNavbar.Text = "OfficeNavigationBar1"
        '
        'NavbarUser2Group
        '
@@ -166,54 +155,50 @@ Partial Class frmUserManager
        Me.NavbarGroup2Group.ShowPeekFormOnItemHover = DevExpress.Utils.DefaultBoolean.[True]
        Me.NavbarGroup2Group.Text = "Gruppenzuordnung"
        '
-        'UCGroupToGroup
+        'ContentPanel
        '
-        Me.UCGroupToGroup.Location = New System.Drawing.Point(22, 163)
-        Me.UCGroupToGroup.Name = "UCGroupToGroup"
-        Me.UCGroupToGroup.Size = New System.Drawing.Size(276, 234)
-        Me.UCGroupToGroup.TabIndex = 5
-        Me.UCGroupToGroup.TextAssignedToParent = "Zugeordnete Gruppen:"
-        Me.UCGroupToGroup.TextNotAssignedToParent = "Nicht zugeordnete Gruppen:"
-        Me.UCGroupToGroup.TextParentList = "Verfügbare Gruppen:"
-        Me.UCGroupToGroup.Visible = False
+        Me.ContentPanel.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.ContentPanel.Location = New System.Drawing.Point(0, 146)
+        Me.ContentPanel.Name = "ContentPanel"
+        Me.ContentPanel.Size = New System.Drawing.Size(1070, 328)
+        Me.ContentPanel.TabIndex = 8
        '
        'frmUserManager
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(1070, 540)
-        Me.Controls.Add(Me.UCGroupToGroup)
-        Me.Controls.Add(Me.UCUserToGroup)
-        Me.Controls.Add(Me.OfficeNavigationBar1)
+        Me.Controls.Add(Me.ContentPanel)
+        Me.Controls.Add(Me.UserNavbar)
        Me.Controls.Add(Me.RibbonStatusBar)
-        Me.Controls.Add(Me.RibbonControl)
+        Me.Controls.Add(Me.UserRibbon)
        Me.Name = "frmUserManager"
-        Me.Ribbon = Me.RibbonControl
+        Me.Ribbon = Me.UserRibbon
        Me.ShowIcon = False
        Me.StatusBar = Me.RibbonStatusBar
        Me.Text = "User Manager"
-        CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.OfficeNavigationBar1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.UserRibbon, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.UserNavbar, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.ContentPanel, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

    End Sub

-    Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl
+    Friend WithEvents UserRibbon As DevExpress.XtraBars.Ribbon.RibbonControl
    Friend WithEvents RibbonPageUserManager As DevExpress.XtraBars.Ribbon.RibbonPage
    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar
    Friend WithEvents BarButtonUserEdit As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonGroupEdit As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageCategoryUserManager As DevExpress.XtraBars.Ribbon.RibbonPageCategory
-    Friend WithEvents UCUserToGroup As UserControlAssignment
    Friend WithEvents BarButtonAssign As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents BarButtonRefresh As DevExpress.XtraBars.BarButtonItem
    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
-    Friend WithEvents OfficeNavigationBar1 As DevExpress.XtraBars.Navigation.OfficeNavigationBar
+    Friend WithEvents UserNavbar As DevExpress.XtraBars.Navigation.OfficeNavigationBar
    Friend WithEvents NavbarUser2Group As DevExpress.XtraBars.Navigation.NavigationBarItem
    Friend WithEvents NavbarGroup2Group As DevExpress.XtraBars.Navigation.NavigationBarItem
-    Friend WithEvents UCGroupToGroup As UserControlAssignment
+    Friend WithEvents ContentPanel As DevExpress.XtraEditors.PanelControl
 End Class