Add First Pass of UserManager

2019-02-19 16:58:01 +01:00
parent 79c2d6c344
commit 6131182d64
22 changed files with 1514 additions and 171 deletions
--- a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.Designer.vb
+++ b/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.Designer.vb
@@ -1,6 +1,6 @@
 <Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmEntityDesigner
-    Inherits DevExpress.XtraEditors.XtraForm
+    Inherits DevExpress.XtraBars.Ribbon.RibbonForm

    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
    <System.Diagnostics.DebuggerNonUserCode()>
@@ -23,16 +23,24 @@ Partial Class frmEntityDesigner
    <System.Diagnostics.DebuggerStepThrough()>
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
-        Me.PanelMain = New ClientSuite.ControlSnapPanel(Me.components)
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEntityDesigner))
+        Me.PanelMain = New DigitalData.GUIs.ClientSuite.ControlSnapPanel(Me.components)
        Me.TabControlMain = New DevExpress.XtraTab.XtraTabControl()
        Me.TabPageControls = New DevExpress.XtraTab.XtraTabPage()
+        Me.Label1 = New System.Windows.Forms.Label()
        Me.btnCombobox = New System.Windows.Forms.Button()
        Me.btnTextbox = New System.Windows.Forms.Button()
        Me.btnLabel = New System.Windows.Forms.Button()
        Me.TabPageProperties = New DevExpress.XtraTab.XtraTabPage()
        Me.PropertyGridMain = New DevExpress.XtraVerticalGrid.PropertyGridControl()
        Me.SplitContainerControlMain = New DevExpress.XtraEditors.SplitContainerControl()
-        Me.Label1 = New System.Windows.Forms.Label()
+        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
+        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+        Me.RibbonPageCategory1 = New DevExpress.XtraBars.Ribbon.RibbonPageCategory()
+        Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage()
+        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
+        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        CType(Me.TabControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.TabControlMain.SuspendLayout()
        Me.TabPageControls.SuspendLayout()
@@ -40,6 +48,7 @@ Partial Class frmEntityDesigner
        CType(Me.PropertyGridMain, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerControlMain.SuspendLayout()
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'PanelMain
@@ -50,7 +59,7 @@ Partial Class frmEntityDesigner
        Me.PanelMain.Location = New System.Drawing.Point(0, 0)
        Me.PanelMain.Name = "PanelMain"
        Me.PanelMain.ShowGrid = True
-        Me.PanelMain.Size = New System.Drawing.Size(564, 450)
+        Me.PanelMain.Size = New System.Drawing.Size(564, 283)
        Me.PanelMain.TabIndex = 0
        '
        'TabControlMain
@@ -59,7 +68,7 @@ Partial Class frmEntityDesigner
        Me.TabControlMain.Location = New System.Drawing.Point(0, 0)
        Me.TabControlMain.Name = "TabControlMain"
        Me.TabControlMain.SelectedTabPage = Me.TabPageControls
-        Me.TabControlMain.Size = New System.Drawing.Size(224, 450)
+        Me.TabControlMain.Size = New System.Drawing.Size(224, 283)
        Me.TabControlMain.TabIndex = 0
        Me.TabControlMain.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageControls, Me.TabPageProperties})
        '
@@ -70,9 +79,18 @@ Partial Class frmEntityDesigner
        Me.TabPageControls.Controls.Add(Me.btnTextbox)
        Me.TabPageControls.Controls.Add(Me.btnLabel)
        Me.TabPageControls.Name = "TabPageControls"
-        Me.TabPageControls.Size = New System.Drawing.Size(222, 425)
+        Me.TabPageControls.Size = New System.Drawing.Size(222, 258)
        Me.TabPageControls.Text = "Controls"
        '
+        'Label1
+        '
+        Me.Label1.Dock = System.Windows.Forms.DockStyle.Top
+        Me.Label1.Location = New System.Drawing.Point(0, 0)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(222, 31)
+        Me.Label1.TabIndex = 2
+        Me.Label1.Text = "Ziehen Sie zum Erstellen einen Controll-Button auf das Panel"
+        '
        'btnCombobox
        '
        Me.btnCombobox.Location = New System.Drawing.Point(3, 92)
@@ -104,7 +122,7 @@ Partial Class frmEntityDesigner
        '
        Me.TabPageProperties.Controls.Add(Me.PropertyGridMain)
        Me.TabPageProperties.Name = "TabPageProperties"
-        Me.TabPageProperties.Size = New System.Drawing.Size(222, 425)
+        Me.TabPageProperties.Size = New System.Drawing.Size(222, 258)
        Me.TabPageProperties.Text = "Properties"
        '
        'PropertyGridMain
@@ -112,32 +130,72 @@ Partial Class frmEntityDesigner
        Me.PropertyGridMain.Dock = System.Windows.Forms.DockStyle.Fill
        Me.PropertyGridMain.Location = New System.Drawing.Point(0, 0)
        Me.PropertyGridMain.Name = "PropertyGridMain"
-        Me.PropertyGridMain.Size = New System.Drawing.Size(222, 425)
+        Me.PropertyGridMain.Size = New System.Drawing.Size(222, 258)
        Me.PropertyGridMain.TabIndex = 0
        '
        'SplitContainerControlMain
        '
        Me.SplitContainerControlMain.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SplitContainerControlMain.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2
-        Me.SplitContainerControlMain.Location = New System.Drawing.Point(0, 0)
+        Me.SplitContainerControlMain.Location = New System.Drawing.Point(0, 146)
        Me.SplitContainerControlMain.Name = "SplitContainerControlMain"
        Me.SplitContainerControlMain.Panel1.Controls.Add(Me.PanelMain)
        Me.SplitContainerControlMain.Panel1.Text = "Panel1"
        Me.SplitContainerControlMain.Panel2.Controls.Add(Me.TabControlMain)
        Me.SplitContainerControlMain.Panel2.Text = "Panel2"
-        Me.SplitContainerControlMain.Size = New System.Drawing.Size(800, 450)
+        Me.SplitContainerControlMain.Size = New System.Drawing.Size(800, 283)
        Me.SplitContainerControlMain.SplitterPosition = 224
        Me.SplitContainerControlMain.TabIndex = 1
        Me.SplitContainerControlMain.Text = "SplitContainerControl1"
        '
-        'Label1
+        'RibbonControl1
        '
-        Me.Label1.Dock = System.Windows.Forms.DockStyle.Top
-        Me.Label1.Location = New System.Drawing.Point(0, 0)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(222, 31)
-        Me.Label1.TabIndex = 2
-        Me.Label1.Text = "Ziehen Sie zum Erstellen einen Controll-Button auf das Panel"
+        Me.RibbonControl1.ExpandCollapseItem.Id = 0
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.BarButtonItem1})
+        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
+        Me.RibbonControl1.MaxItemId = 2
+        Me.RibbonControl1.Name = "RibbonControl1"
+        Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1})
+        Me.RibbonControl1.Size = New System.Drawing.Size(800, 146)
+        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
+        '
+        'BarButtonItem1
+        '
+        Me.BarButtonItem1.Caption = "Control Löschen"
+        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"
+        '
+        'RibbonPageCategory1
+        '
+        Me.RibbonPageCategory1.Name = "RibbonPageCategory1"
+        Me.RibbonPageCategory1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage3})
+        Me.RibbonPageCategory1.Text = "Entitäten Designer"
+        '
+        'RibbonPage3
+        '
+        Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3})
+        Me.RibbonPage3.Name = "RibbonPage3"
+        Me.RibbonPage3.Text = "Control Actions"
+        '
+        'RibbonPageGroup3
+        '
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
+        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
+        Me.RibbonPageGroup3.Text = "RibbonPageGroup3"
+        '
+        'RibbonStatusBar1
+        '
+        Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 429)
+        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 21)
+        '
+        'RibbonPage2
+        '
+        Me.RibbonPage2.Name = "RibbonPage2"
+        Me.RibbonPage2.Text = "RibbonPage2"
        '
        'frmEntityDesigner
        '
@@ -145,7 +203,11 @@ Partial Class frmEntityDesigner
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(800, 450)
        Me.Controls.Add(Me.SplitContainerControlMain)
+        Me.Controls.Add(Me.RibbonStatusBar1)
+        Me.Controls.Add(Me.RibbonControl1)
        Me.Name = "frmEntityDesigner"
+        Me.Ribbon = Me.RibbonControl1
+        Me.StatusBar = Me.RibbonStatusBar1
        Me.Text = "Entitäten Designer"
        CType(Me.TabControlMain, System.ComponentModel.ISupportInitialize).EndInit()
        Me.TabControlMain.ResumeLayout(False)
@@ -154,7 +216,9 @@ Partial Class frmEntityDesigner
        CType(Me.PropertyGridMain, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.SplitContainerControlMain, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerControlMain.ResumeLayout(False)
+        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
+        Me.PerformLayout()

    End Sub
    Friend WithEvents TabControlMain As DevExpress.XtraTab.XtraTabControl
@@ -167,4 +231,11 @@ Partial Class frmEntityDesigner
    Friend WithEvents SplitContainerControlMain As DevExpress.XtraEditors.SplitContainerControl
    Friend WithEvents btnCombobox As Button
    Friend WithEvents Label1 As Label
+    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 RibbonPageCategory1 As DevExpress.XtraBars.Ribbon.RibbonPageCategory
+    Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage
+    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
 End Class
--- a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.resx
+++ b/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.resx
@@ -117,4 +117,28 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="BarButtonItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAENhbmNlbDtTdG9wO0V4aXQ7QmFy
+        cztSaWJib247TJaWsgAAAMJJREFUOE+Nk0sKAjEQRHM4YVZ6CS8gfhBGHK/pSRRXbRWkJOlOq4sHSf0Y
+        BlLMrNy3qzWYef4HZC/s8KzyCxi4+rAHmVvNsrOhcKqCSEfgqSz2Ms7OCCPQfPlIvQ2kIzgPy+QzUIN+
+        ZAFpmXQDBAE/0tKVSXcRCI5GQpkEgSDsP5sso2wQEByVRRjpLgj48gGEH9t2vpYbLx35WRbQhiM0+DBa
+        I5QFPD8yU5zAowppWSCjkSeYJHJk58MZyPIBTmZW3tJAnMwmSptiAAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="BarButtonItem1.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAENhbmNlbDtTdG9wO0V4aXQ7QmFy
+        cztSaWJib247TJaWsgAAAW5JREFUWEfFlk1KBDEUhGfmAg56JTcuHEGP4FFFFMVZz1VcxaomD57pek1e
+        hLj4FilSP9Dd0LtSyr8ixZlIcSZSnIkUL8+3f6LJOvhzixRr0BV4AXf13I3LuQev4OjzPVKEgeUfoIBv
+        kBpRM1hOLzM+gRyxEnDxALiaRiM7wpcbzNy3fb8OBi4+gTagd4Qq5/lBda0EgsvksRrboK0RqXIiRRiM
+        zIh0OZEiTJ6eEUPlRIowtmyNGC4nUoRZEY0YLidSRECEGuFJlRMpImSLaMRSDmRmhBQZsoF65jZgeTFV
+        ZoQUGRIQlRvLCJUZIUWEKKK3XWndI6SIgN5yPvPwE1XZLVKEubfc7gyPkCKMmXJjaIQUYSJR+Qn4Yk96
+        hBRhGCk3UiNWAi7uwVs1+oCeckONeAfdPyTX4Ksas+WW4UecwU3bQ1YCwWXCEVydKicuhyOYIcuJFC0I
+        8P/Qn7tosvK/5TOR4kykOBMpzqPsfgBphQ1j4i+mWAAAAABJRU5ErkJggg==
+</value>
+  </data>
 </root>
--- a/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb
+++ b/EDMI_ClientSuite/EntityDesigner/frmEntityDesigner.vb
@@ -255,8 +255,4 @@ Public Class frmEntityDesigner
                End If
        End Select
    End Sub
-
-    Private Sub frmEntityDesigner_Closing(sender As Object, e As CancelEventArgs) Handles Me.Closing
-        My.MainForm.RibbonPageCategoryEntityDesigner.Visible = False
-    End Sub
 End Class