MS

2022-06-09 16:42:40 +02:00
parent 8af73bd7d7
commit b263d7d70e
7 changed files with 208 additions and 76 deletions
--- a/GUIs.ZooFlow/frmTreeViewNavi.Designer.vb
+++ b/GUIs.ZooFlow/frmTreeViewNavi.Designer.vb
@@ -26,12 +26,12 @@ Partial Class frmTreeViewNavi
        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmTreeViewNavi))
        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
        Me.BarCheckItemAdminFolderRights = New DevExpress.XtraBars.BarCheckItem()
-        Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
-        Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItemAddRelation = New DevExpress.XtraBars.BarButtonItem()
+        Me.BarButtonItemRelationDel = New DevExpress.XtraBars.BarButtonItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
-        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonPageGroupRelationsChange = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.TreeList2 = New DevExpress.XtraTreeList.TreeList()
@@ -44,6 +44,9 @@ Partial Class frmTreeViewNavi
        Me.GridViewFreeUser = New DevExpress.XtraGrid.Views.Grid.GridView()
        Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
        Me.ImageCollection1 = New DevExpress.Utils.ImageCollection(Me.components)
+        Me.GridControlFreeGroups = New DevExpress.XtraGrid.GridControl()
+        Me.GridViewFreeGroups = New DevExpress.XtraGrid.Views.Grid.GridView()
+        Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TreeList2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -59,14 +62,18 @@ Partial Class frmTreeViewNavi
        Me.XtraTabPage1.SuspendLayout()
        CType(Me.GridControlFreeUser, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridViewFreeUser, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.XtraTabPage2.SuspendLayout()
        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControlFreeGroups, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridViewFreeGroups, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'RibbonControl1
        '
        Me.RibbonControl1.EmptyAreaImageOptions.ImagePadding = New System.Windows.Forms.Padding(45, 48, 45, 48)
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarCheckItemAdminFolderRights, Me.BarButtonItem1, Me.BarButtonItem2})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarCheckItemAdminFolderRights, Me.BarButtonItemAddRelation, Me.BarButtonItemRelationDel})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
        Me.RibbonControl1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.RibbonControl1.MaxItemId = 4
@@ -74,7 +81,7 @@ Partial Class frmTreeViewNavi
        Me.RibbonControl1.OptionsMenuMinWidth = 495
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
-        Me.RibbonControl1.Size = New System.Drawing.Size(949, 160)
+        Me.RibbonControl1.Size = New System.Drawing.Size(1116, 160)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
        'BarCheckItemAdminFolderRights
@@ -84,23 +91,23 @@ Partial Class frmTreeViewNavi
        Me.BarCheckItemAdminFolderRights.ImageOptions.SvgImage = CType(resources.GetObject("BarCheckItemAdminFolderRights.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.BarCheckItemAdminFolderRights.Name = "BarCheckItemAdminFolderRights"
        '
-        'BarButtonItem1
+        'BarButtonItemAddRelation
        '
-        Me.BarButtonItem1.Caption = "Hinzufügen"
-        Me.BarButtonItem1.Id = 2
-        Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem1.Name = "BarButtonItem1"
+        Me.BarButtonItemAddRelation.Caption = "Hinzufügen"
+        Me.BarButtonItemAddRelation.Id = 2
+        Me.BarButtonItemAddRelation.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItemAddRelation.Name = "BarButtonItemAddRelation"
        '
-        'BarButtonItem2
+        'BarButtonItemRelationDel
        '
-        Me.BarButtonItem2.Caption = "Entfernen"
-        Me.BarButtonItem2.Id = 3
-        Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.BarButtonItem2.Name = "BarButtonItem2"
+        Me.BarButtonItemRelationDel.Caption = "Entfernen"
+        Me.BarButtonItemRelationDel.Id = 3
+        Me.BarButtonItemRelationDel.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItemRelationDel.Name = "BarButtonItemRelationDel"
        '
        'RibbonPage1
        '
-        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3})
+        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroupRelationsChange})
        Me.RibbonPage1.Name = "RibbonPage1"
        Me.RibbonPage1.Text = "Start"
        '
@@ -116,13 +123,14 @@ Partial Class frmTreeViewNavi
        Me.RibbonPageGroup2.Name = "RibbonPageGroup2"
        Me.RibbonPageGroup2.Text = "Einstellungen"
        '
-        'RibbonPageGroup3
+        'RibbonPageGroupRelationsChange
        '
-        Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1)
-        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2)
-        Me.RibbonPageGroup3.Name = "RibbonPageGroup3"
-        Me.RibbonPageGroup3.Text = "Relationen anpassen"
+        Me.RibbonPageGroupRelationsChange.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
+        Me.RibbonPageGroupRelationsChange.ItemLinks.Add(Me.BarButtonItemAddRelation)
+        Me.RibbonPageGroupRelationsChange.ItemLinks.Add(Me.BarButtonItemRelationDel)
+        Me.RibbonPageGroupRelationsChange.Name = "RibbonPageGroupRelationsChange"
+        Me.RibbonPageGroupRelationsChange.Text = "Relationen anpassen"
+        Me.RibbonPageGroupRelationsChange.Visible = False
        '
        'RibbonStatusBar1
        '
@@ -130,7 +138,7 @@ Partial Class frmTreeViewNavi
        Me.RibbonStatusBar1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5)
        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
-        Me.RibbonStatusBar1.Size = New System.Drawing.Size(949, 22)
+        Me.RibbonStatusBar1.Size = New System.Drawing.Size(1116, 22)
        '
        'RibbonPage2
        '
@@ -154,6 +162,7 @@ Partial Class frmTreeViewNavi
        Me.TreeList2.OptionsView.ShowTreeLines = DevExpress.Utils.DefaultBoolean.[False]
        Me.TreeList2.OptionsView.ShowVertLines = False
        Me.TreeList2.Size = New System.Drawing.Size(412, 432)
+        Me.TreeList2.StateImageList = Me.SvgImageCollection1
        Me.TreeList2.TabIndex = 5
        '
        'SplitContainerControl1
@@ -173,18 +182,18 @@ Partial Class frmTreeViewNavi
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.GridControlRelations)
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.XtraTabControlRelationScope)
        Me.SplitContainerControl1.Panel2.Text = "Panel2"
-        Me.SplitContainerControl1.Size = New System.Drawing.Size(949, 432)
+        Me.SplitContainerControl1.Size = New System.Drawing.Size(1116, 432)
        Me.SplitContainerControl1.SplitterPosition = 412
        Me.SplitContainerControl1.TabIndex = 8
        '
        'GridControlRelations
        '
        Me.GridControlRelations.Dock = System.Windows.Forms.DockStyle.Right
-        Me.GridControlRelations.Location = New System.Drawing.Point(344, 0)
+        Me.GridControlRelations.Location = New System.Drawing.Point(398, 0)
        Me.GridControlRelations.MainView = Me.GridViewRelations
        Me.GridControlRelations.MenuManager = Me.RibbonControl1
        Me.GridControlRelations.Name = "GridControlRelations"
-        Me.GridControlRelations.Size = New System.Drawing.Size(183, 432)
+        Me.GridControlRelations.Size = New System.Drawing.Size(296, 432)
        Me.GridControlRelations.TabIndex = 2
        Me.GridControlRelations.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewRelations})
        '
@@ -196,15 +205,18 @@ Partial Class frmTreeViewNavi
        Me.GridViewRelations.OptionsSelection.EnableAppearanceFocusedCell = False
        Me.GridViewRelations.OptionsView.ShowAutoFilterRow = True
        Me.GridViewRelations.OptionsView.ShowGroupPanel = False
-        Me.GridViewRelations.ViewCaption = "Nicht zugeordnete User"
+        Me.GridViewRelations.OptionsView.ShowViewCaption = True
+        Me.GridViewRelations.ViewCaption = "..."
        '
        'XtraTabControlRelationScope
        '
-        Me.XtraTabControlRelationScope.Dock = System.Windows.Forms.DockStyle.Left
-        Me.XtraTabControlRelationScope.Location = New System.Drawing.Point(0, 0)
+        Me.XtraTabControlRelationScope.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.XtraTabControlRelationScope.Location = New System.Drawing.Point(68, 0)
        Me.XtraTabControlRelationScope.Name = "XtraTabControlRelationScope"
        Me.XtraTabControlRelationScope.SelectedTabPage = Me.XtraTabPage1
-        Me.XtraTabControlRelationScope.Size = New System.Drawing.Size(211, 432)
+        Me.XtraTabControlRelationScope.Size = New System.Drawing.Size(324, 432)
        Me.XtraTabControlRelationScope.TabIndex = 1
        Me.XtraTabControlRelationScope.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage1, Me.XtraTabPage2})
        '
@@ -212,7 +224,7 @@ Partial Class frmTreeViewNavi
        '
        Me.XtraTabPage1.Controls.Add(Me.GridControlFreeUser)
        Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(209, 409)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(322, 409)
        Me.XtraTabPage1.Text = "Freie User"
        '
        'GridControlFreeUser
@@ -222,7 +234,7 @@ Partial Class frmTreeViewNavi
        Me.GridControlFreeUser.MainView = Me.GridViewFreeUser
        Me.GridControlFreeUser.MenuManager = Me.RibbonControl1
        Me.GridControlFreeUser.Name = "GridControlFreeUser"
-        Me.GridControlFreeUser.Size = New System.Drawing.Size(209, 409)
+        Me.GridControlFreeUser.Size = New System.Drawing.Size(322, 409)
        Me.GridControlFreeUser.TabIndex = 0
        Me.GridControlFreeUser.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFreeUser})
        '
@@ -238,8 +250,9 @@ Partial Class frmTreeViewNavi
        '
        'XtraTabPage2
        '
+        Me.XtraTabPage2.Controls.Add(Me.GridControlFreeGroups)
        Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(209, 409)
+        Me.XtraTabPage2.Size = New System.Drawing.Size(240, 409)
        Me.XtraTabPage2.Text = "Freie Gruppen"
        '
        'ImageCollection1
@@ -248,12 +261,38 @@ Partial Class frmTreeViewNavi
        Me.ImageCollection1.Images.SetKeyName(0, "team_32x32.png")
        Me.ImageCollection1.Images.SetKeyName(1, "customer_32x32.png")
        '
+        'GridControlFreeGroups
+        '
+        Me.GridControlFreeGroups.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.GridControlFreeGroups.Location = New System.Drawing.Point(0, 0)
+        Me.GridControlFreeGroups.MainView = Me.GridViewFreeGroups
+        Me.GridControlFreeGroups.MenuManager = Me.RibbonControl1
+        Me.GridControlFreeGroups.Name = "GridControlFreeGroups"
+        Me.GridControlFreeGroups.Size = New System.Drawing.Size(240, 409)
+        Me.GridControlFreeGroups.TabIndex = 1
+        Me.GridControlFreeGroups.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewFreeGroups})
+        '
+        'GridViewFreeGroups
+        '
+        Me.GridViewFreeGroups.GridControl = Me.GridControlFreeGroups
+        Me.GridViewFreeGroups.Name = "GridViewFreeGroups"
+        Me.GridViewFreeGroups.OptionsBehavior.Editable = False
+        Me.GridViewFreeGroups.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewFreeGroups.OptionsView.ShowAutoFilterRow = True
+        Me.GridViewFreeGroups.OptionsView.ShowGroupPanel = False
+        Me.GridViewFreeGroups.ViewCaption = "Nicht zugeordnete User"
+        '
+        'SvgImageCollection1
+        '
+        Me.SvgImageCollection1.Add("open", "image://svgimages/actions/open.svg")
+        Me.SvgImageCollection1.Add("opened", "image://svgimages/actions/open2.svg")
+        '
        'frmTreeViewNavi
        '
        Me.Appearance.Options.UseFont = True
        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 21.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(949, 614)
+        Me.ClientSize = New System.Drawing.Size(1116, 614)
        Me.Controls.Add(Me.SplitContainerControl1)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.RibbonControl1)
@@ -278,7 +317,11 @@ Partial Class frmTreeViewNavi
        Me.XtraTabPage1.ResumeLayout(False)
        CType(Me.GridControlFreeUser, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.GridViewFreeUser, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.XtraTabPage2.ResumeLayout(False)
        CType(Me.ImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlFreeGroups, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridViewFreeGroups, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@@ -295,13 +338,16 @@ Partial Class frmTreeViewNavi
    Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
    Friend WithEvents GridControlFreeUser As DevExpress.XtraGrid.GridControl
    Friend WithEvents GridViewFreeUser As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
-    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents BarButtonItemAddRelation As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItemRelationDel As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RibbonPageGroupRelationsChange As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents GridControlRelations As DevExpress.XtraGrid.GridControl
    Friend WithEvents GridViewRelations As DevExpress.XtraGrid.Views.Grid.GridView
    Friend WithEvents XtraTabControlRelationScope As DevExpress.XtraTab.XtraTabControl
    Friend WithEvents XtraTabPage1 As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
    Friend WithEvents ImageCollection1 As DevExpress.Utils.ImageCollection
+    Friend WithEvents GridControlFreeGroups As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridViewFreeGroups As DevExpress.XtraGrid.Views.Grid.GridView
+    Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
 End Class