diff --git a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb
index 8a8a2c2a..6f41c31e 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_CWProfile.Designer.vb
@@ -26,6 +26,8 @@ Partial Class frmAdmin_CWProfile
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
+ Me.labelStatus = New DevExpress.XtraBars.BarStaticItem()
+ Me.labelError = New DevExpress.XtraBars.BarStaticItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
@@ -35,43 +37,56 @@ Partial Class frmAdmin_CWProfile
Me.TBCW_PROFILESTableAdapter = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TBCW_PROFILESTableAdapter()
Me.TableAdapterManager = New DigitalData.GUIs.ZooFlow.DBCW_StammdatenTableAdapters.TableAdapterManager()
Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
- Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit()
- Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
Me.TextEdit2 = New DevExpress.XtraEditors.TextEdit()
- Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit()
- Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
Me.txtAddedWho = New DevExpress.XtraEditors.TextEdit()
- Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
Me.txtAddedWhen = New DevExpress.XtraEditors.TextEdit()
- Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit()
- Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit()
+ Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
+ Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.LayoutControlItem6 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem()
- Me.labelStatus = New DevExpress.XtraBars.BarStaticItem()
- Me.labelError = New DevExpress.XtraBars.BarStaticItem()
+ Me.CheckEdit1 = New DevExpress.XtraEditors.CheckEdit()
+ Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.TextEdit4 = New DevExpress.XtraEditors.TextEdit()
+ Me.LayoutControlItem9 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.TextEdit5 = New DevExpress.XtraEditors.TextEdit()
+ Me.LayoutControlItem10 = New DevExpress.XtraLayout.LayoutControlItem()
+ Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton()
+ Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.DBCW_Stammdaten, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.LayoutControl1.SuspendLayout()
- CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtAddedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
- CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
'
'RibbonControl1
@@ -86,7 +101,7 @@ Partial Class frmAdmin_CWProfile
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
Me.RibbonControl1.ShowToolbarCustomizeItem = False
- Me.RibbonControl1.Size = New System.Drawing.Size(800, 63)
+ Me.RibbonControl1.Size = New System.Drawing.Size(800, 66)
Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
'
@@ -104,6 +119,21 @@ Partial Class frmAdmin_CWProfile
Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.save2
Me.BarButtonItem2.Name = "BarButtonItem2"
'
+ 'labelStatus
+ '
+ Me.labelStatus.Caption = "BarStaticItem1"
+ Me.labelStatus.Id = 3
+ Me.labelStatus.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.about3
+ Me.labelStatus.Name = "labelStatus"
+ Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
+ '
+ 'labelError
+ '
+ Me.labelError.Caption = "BarStaticItem2"
+ Me.labelError.Id = 4
+ Me.labelError.Name = "labelError"
+ Me.labelError.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
+ '
'RibbonPage1
'
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
@@ -121,10 +151,10 @@ Partial Class frmAdmin_CWProfile
'
Me.RibbonStatusBar1.ItemLinks.Add(Me.labelStatus)
Me.RibbonStatusBar1.ItemLinks.Add(Me.labelError)
- Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 426)
+ Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 428)
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
- Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 24)
+ Me.RibbonStatusBar1.Size = New System.Drawing.Size(800, 22)
'
'RibbonPage2
'
@@ -160,53 +190,107 @@ Partial Class frmAdmin_CWProfile
Me.LayoutControl1.Controls.Add(Me.txtAddedWhen)
Me.LayoutControl1.Controls.Add(Me.txtChangedWho)
Me.LayoutControl1.Controls.Add(Me.txtChangedWhen)
+ Me.LayoutControl1.Controls.Add(Me.CheckEdit1)
+ Me.LayoutControl1.Controls.Add(Me.TextEdit4)
+ Me.LayoutControl1.Controls.Add(Me.TextEdit5)
+ Me.LayoutControl1.Controls.Add(Me.SimpleButton1)
Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill
- Me.LayoutControl1.Location = New System.Drawing.Point(0, 63)
+ Me.LayoutControl1.Location = New System.Drawing.Point(0, 66)
Me.LayoutControl1.Name = "LayoutControl1"
Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(848, 159, 650, 400)
Me.LayoutControl1.Root = Me.Root
- Me.LayoutControl1.Size = New System.Drawing.Size(800, 363)
+ Me.LayoutControl1.Size = New System.Drawing.Size(800, 362)
Me.LayoutControl1.TabIndex = 2
Me.LayoutControl1.Text = "LayoutControl1"
'
+ 'TextEdit1
+ '
+ Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "GUID", True))
+ Me.TextEdit1.Location = New System.Drawing.Point(145, 20)
+ Me.TextEdit1.MenuManager = Me.RibbonControl1
+ Me.TextEdit1.Name = "TextEdit1"
+ Me.TextEdit1.Size = New System.Drawing.Size(245, 20)
+ Me.TextEdit1.StyleController = Me.LayoutControl1
+ Me.TextEdit1.TabIndex = 4
+ '
+ 'TextEdit2
+ '
+ Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True))
+ Me.TextEdit2.Location = New System.Drawing.Point(145, 60)
+ Me.TextEdit2.MenuManager = Me.RibbonControl1
+ Me.TextEdit2.Name = "TextEdit2"
+ Me.TextEdit2.Size = New System.Drawing.Size(635, 20)
+ Me.TextEdit2.StyleController = Me.LayoutControl1
+ Me.TextEdit2.TabIndex = 5
+ '
+ 'TextEdit3
+ '
+ Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "COMMENT", True))
+ Me.TextEdit3.Location = New System.Drawing.Point(145, 100)
+ Me.TextEdit3.MenuManager = Me.RibbonControl1
+ Me.TextEdit3.Name = "TextEdit3"
+ Me.TextEdit3.Size = New System.Drawing.Size(635, 20)
+ Me.TextEdit3.StyleController = Me.LayoutControl1
+ Me.TextEdit3.TabIndex = 6
+ '
+ 'txtAddedWho
+ '
+ Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True))
+ Me.txtAddedWho.Location = New System.Drawing.Point(145, 246)
+ Me.txtAddedWho.MenuManager = Me.RibbonControl1
+ Me.txtAddedWho.Name = "txtAddedWho"
+ Me.txtAddedWho.Size = New System.Drawing.Size(244, 20)
+ Me.txtAddedWho.StyleController = Me.LayoutControl1
+ Me.txtAddedWho.TabIndex = 7
+ '
+ 'txtAddedWhen
+ '
+ Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True))
+ Me.txtAddedWhen.Location = New System.Drawing.Point(534, 246)
+ Me.txtAddedWhen.MenuManager = Me.RibbonControl1
+ Me.txtAddedWhen.Name = "txtAddedWhen"
+ Me.txtAddedWhen.Size = New System.Drawing.Size(246, 20)
+ Me.txtAddedWhen.StyleController = Me.LayoutControl1
+ Me.txtAddedWhen.TabIndex = 8
+ '
+ 'txtChangedWho
+ '
+ Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True))
+ Me.txtChangedWho.Location = New System.Drawing.Point(145, 286)
+ Me.txtChangedWho.MenuManager = Me.RibbonControl1
+ Me.txtChangedWho.Name = "txtChangedWho"
+ Me.txtChangedWho.Size = New System.Drawing.Size(244, 20)
+ Me.txtChangedWho.StyleController = Me.LayoutControl1
+ Me.txtChangedWho.TabIndex = 9
+ '
+ 'txtChangedWhen
+ '
+ Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True))
+ Me.txtChangedWhen.Location = New System.Drawing.Point(534, 286)
+ Me.txtChangedWhen.MenuManager = Me.RibbonControl1
+ Me.txtChangedWhen.Name = "txtChangedWhen"
+ Me.txtChangedWhen.Size = New System.Drawing.Size(246, 20)
+ Me.txtChangedWhen.StyleController = Me.LayoutControl1
+ Me.txtChangedWhen.TabIndex = 10
+ '
'Root
'
Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
Me.Root.GroupBordersVisible = False
- Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7})
+ Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem6, Me.LayoutControlItem5, Me.LayoutControlItem7, Me.LayoutControlItem10, Me.LayoutControlItem9, Me.LayoutControlItem11, Me.LayoutControlItem8, Me.LayoutControlItem1})
Me.Root.Name = "Root"
- Me.Root.Size = New System.Drawing.Size(800, 363)
+ Me.Root.Size = New System.Drawing.Size(800, 362)
Me.Root.TextVisible = False
'
- 'TextEdit1
- '
- Me.TextEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "GUID", True))
- Me.TextEdit1.Location = New System.Drawing.Point(108, 20)
- Me.TextEdit1.MenuManager = Me.RibbonControl1
- Me.TextEdit1.Name = "TextEdit1"
- Me.TextEdit1.Size = New System.Drawing.Size(672, 20)
- Me.TextEdit1.StyleController = Me.LayoutControl1
- Me.TextEdit1.TabIndex = 4
- '
'LayoutControlItem1
'
Me.LayoutControlItem1.Control = Me.TextEdit1
Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
Me.LayoutControlItem1.Name = "LayoutControlItem1"
Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
- Me.LayoutControlItem1.Size = New System.Drawing.Size(780, 40)
+ Me.LayoutControlItem1.Size = New System.Drawing.Size(390, 40)
Me.LayoutControlItem1.Text = "GUID"
- Me.LayoutControlItem1.TextSize = New System.Drawing.Size(76, 13)
- '
- 'TextEdit2
- '
- Me.TextEdit2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "NAME", True))
- Me.TextEdit2.Location = New System.Drawing.Point(108, 60)
- Me.TextEdit2.MenuManager = Me.RibbonControl1
- Me.TextEdit2.Name = "TextEdit2"
- Me.TextEdit2.Size = New System.Drawing.Size(672, 20)
- Me.TextEdit2.StyleController = Me.LayoutControl1
- Me.TextEdit2.TabIndex = 5
+ Me.LayoutControlItem1.TextSize = New System.Drawing.Size(122, 13)
'
'LayoutControlItem2
'
@@ -216,17 +300,7 @@ Partial Class frmAdmin_CWProfile
Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem2.Size = New System.Drawing.Size(780, 40)
Me.LayoutControlItem2.Text = "Profil"
- Me.LayoutControlItem2.TextSize = New System.Drawing.Size(76, 13)
- '
- 'TextEdit3
- '
- Me.TextEdit3.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "COMMENT", True))
- Me.TextEdit3.Location = New System.Drawing.Point(108, 100)
- Me.TextEdit3.MenuManager = Me.RibbonControl1
- Me.TextEdit3.Name = "TextEdit3"
- Me.TextEdit3.Size = New System.Drawing.Size(672, 20)
- Me.TextEdit3.StyleController = Me.LayoutControl1
- Me.TextEdit3.TabIndex = 6
+ Me.LayoutControlItem2.TextSize = New System.Drawing.Size(122, 13)
'
'LayoutControlItem3
'
@@ -236,101 +310,126 @@ Partial Class frmAdmin_CWProfile
Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
Me.LayoutControlItem3.Size = New System.Drawing.Size(780, 40)
Me.LayoutControlItem3.Text = "Kommentar"
- Me.LayoutControlItem3.TextSize = New System.Drawing.Size(76, 13)
- '
- 'txtAddedWho
- '
- Me.txtAddedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHO", True))
- Me.txtAddedWho.Location = New System.Drawing.Point(108, 140)
- Me.txtAddedWho.MenuManager = Me.RibbonControl1
- Me.txtAddedWho.Name = "txtAddedWho"
- Me.txtAddedWho.Size = New System.Drawing.Size(282, 20)
- Me.txtAddedWho.StyleController = Me.LayoutControl1
- Me.txtAddedWho.TabIndex = 7
+ Me.LayoutControlItem3.TextSize = New System.Drawing.Size(122, 13)
'
'LayoutControlItem4
'
Me.LayoutControlItem4.Control = Me.txtAddedWho
- Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120)
+ Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 226)
Me.LayoutControlItem4.Name = "LayoutControlItem4"
Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
- Me.LayoutControlItem4.Size = New System.Drawing.Size(390, 40)
+ Me.LayoutControlItem4.Size = New System.Drawing.Size(389, 40)
Me.LayoutControlItem4.Text = "Erstellt Wer"
- Me.LayoutControlItem4.TextSize = New System.Drawing.Size(76, 13)
- '
- 'txtAddedWhen
- '
- Me.txtAddedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHO", True))
- Me.txtAddedWhen.Location = New System.Drawing.Point(498, 140)
- Me.txtAddedWhen.MenuManager = Me.RibbonControl1
- Me.txtAddedWhen.Name = "txtAddedWhen"
- Me.txtAddedWhen.Size = New System.Drawing.Size(282, 20)
- Me.txtAddedWhen.StyleController = Me.LayoutControl1
- Me.txtAddedWhen.TabIndex = 8
- '
- 'LayoutControlItem5
- '
- Me.LayoutControlItem5.Control = Me.txtAddedWhen
- Me.LayoutControlItem5.Location = New System.Drawing.Point(390, 120)
- Me.LayoutControlItem5.Name = "LayoutControlItem5"
- Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
- Me.LayoutControlItem5.Size = New System.Drawing.Size(390, 40)
- Me.LayoutControlItem5.Text = "Erstellt Wann"
- Me.LayoutControlItem5.TextSize = New System.Drawing.Size(76, 13)
- '
- 'txtChangedWho
- '
- Me.txtChangedWho.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ADDED_WHEN", True))
- Me.txtChangedWho.Location = New System.Drawing.Point(108, 180)
- Me.txtChangedWho.MenuManager = Me.RibbonControl1
- Me.txtChangedWho.Name = "txtChangedWho"
- Me.txtChangedWho.Size = New System.Drawing.Size(282, 20)
- Me.txtChangedWho.StyleController = Me.LayoutControl1
- Me.txtChangedWho.TabIndex = 9
+ Me.LayoutControlItem4.TextSize = New System.Drawing.Size(122, 13)
'
'LayoutControlItem6
'
Me.LayoutControlItem6.Control = Me.txtChangedWho
- Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 160)
+ Me.LayoutControlItem6.Location = New System.Drawing.Point(0, 266)
Me.LayoutControlItem6.Name = "LayoutControlItem6"
Me.LayoutControlItem6.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
- Me.LayoutControlItem6.Size = New System.Drawing.Size(390, 183)
+ Me.LayoutControlItem6.Size = New System.Drawing.Size(389, 76)
Me.LayoutControlItem6.Text = "Geändert Wer"
- Me.LayoutControlItem6.TextSize = New System.Drawing.Size(76, 13)
+ Me.LayoutControlItem6.TextSize = New System.Drawing.Size(122, 13)
'
- 'txtChangedWhen
+ 'LayoutControlItem5
'
- Me.txtChangedWhen.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "CHANGED_WHEN", True))
- Me.txtChangedWhen.Location = New System.Drawing.Point(498, 180)
- Me.txtChangedWhen.MenuManager = Me.RibbonControl1
- Me.txtChangedWhen.Name = "txtChangedWhen"
- Me.txtChangedWhen.Size = New System.Drawing.Size(282, 20)
- Me.txtChangedWhen.StyleController = Me.LayoutControl1
- Me.txtChangedWhen.TabIndex = 10
+ Me.LayoutControlItem5.Control = Me.txtAddedWhen
+ Me.LayoutControlItem5.Location = New System.Drawing.Point(389, 226)
+ Me.LayoutControlItem5.Name = "LayoutControlItem5"
+ Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+ Me.LayoutControlItem5.Size = New System.Drawing.Size(391, 40)
+ Me.LayoutControlItem5.Text = "Erstellt Wann"
+ Me.LayoutControlItem5.TextSize = New System.Drawing.Size(122, 13)
'
'LayoutControlItem7
'
Me.LayoutControlItem7.Control = Me.txtChangedWhen
- Me.LayoutControlItem7.Location = New System.Drawing.Point(390, 160)
+ Me.LayoutControlItem7.Location = New System.Drawing.Point(389, 266)
Me.LayoutControlItem7.Name = "LayoutControlItem7"
Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
- Me.LayoutControlItem7.Size = New System.Drawing.Size(390, 183)
+ Me.LayoutControlItem7.Size = New System.Drawing.Size(391, 76)
Me.LayoutControlItem7.Text = "Geändert Wann"
- Me.LayoutControlItem7.TextSize = New System.Drawing.Size(76, 13)
+ Me.LayoutControlItem7.TextSize = New System.Drawing.Size(122, 13)
'
- 'labelStatus
+ 'CheckEdit1
'
- Me.labelStatus.Caption = "BarStaticItem1"
- Me.labelStatus.Id = 3
- Me.labelStatus.Name = "labelStatus"
- Me.labelStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
+ Me.CheckEdit1.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "ACTIVE", True))
+ Me.CheckEdit1.Location = New System.Drawing.Point(410, 20)
+ Me.CheckEdit1.MenuManager = Me.RibbonControl1
+ Me.CheckEdit1.Name = "CheckEdit1"
+ Me.CheckEdit1.Properties.Caption = "Aktiv"
+ Me.CheckEdit1.Size = New System.Drawing.Size(370, 18)
+ Me.CheckEdit1.StyleController = Me.LayoutControl1
+ Me.CheckEdit1.TabIndex = 11
'
- 'labelError
+ 'LayoutControlItem8
'
- Me.labelError.Caption = "BarStaticItem2"
- Me.labelError.Id = 4
- Me.labelError.Name = "labelError"
- Me.labelError.Visibility = DevExpress.XtraBars.BarItemVisibility.OnlyInCustomizing
+ Me.LayoutControlItem8.Control = Me.CheckEdit1
+ Me.LayoutControlItem8.Location = New System.Drawing.Point(390, 0)
+ Me.LayoutControlItem8.Name = "LayoutControlItem8"
+ Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+ Me.LayoutControlItem8.Size = New System.Drawing.Size(390, 40)
+ Me.LayoutControlItem8.TextSize = New System.Drawing.Size(0, 0)
+ Me.LayoutControlItem8.TextVisible = False
+ '
+ 'TextEdit4
+ '
+ Me.TextEdit4.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBCW_PROFILESBindingSource, "REGEX_EXPRESSION", True))
+ Me.TextEdit4.Location = New System.Drawing.Point(145, 140)
+ Me.TextEdit4.MenuManager = Me.RibbonControl1
+ Me.TextEdit4.Name = "TextEdit4"
+ Me.TextEdit4.Size = New System.Drawing.Size(635, 20)
+ Me.TextEdit4.StyleController = Me.LayoutControl1
+ Me.TextEdit4.TabIndex = 12
+ '
+ 'LayoutControlItem9
+ '
+ Me.LayoutControlItem9.Control = Me.TextEdit4
+ Me.LayoutControlItem9.Location = New System.Drawing.Point(0, 120)
+ Me.LayoutControlItem9.Name = "LayoutControlItem9"
+ Me.LayoutControlItem9.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+ Me.LayoutControlItem9.Size = New System.Drawing.Size(780, 40)
+ Me.LayoutControlItem9.Text = "Regular Expression"
+ Me.LayoutControlItem9.TextSize = New System.Drawing.Size(122, 13)
+ '
+ 'TextEdit5
+ '
+ Me.TextEdit5.Location = New System.Drawing.Point(145, 180)
+ Me.TextEdit5.MenuManager = Me.RibbonControl1
+ Me.TextEdit5.Name = "TextEdit5"
+ Me.TextEdit5.Size = New System.Drawing.Size(635, 20)
+ Me.TextEdit5.StyleController = Me.LayoutControl1
+ Me.TextEdit5.TabIndex = 13
+ '
+ 'LayoutControlItem10
+ '
+ Me.LayoutControlItem10.Control = Me.TextEdit5
+ Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 160)
+ Me.LayoutControlItem10.Name = "LayoutControlItem10"
+ Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
+ Me.LayoutControlItem10.Size = New System.Drawing.Size(780, 40)
+ Me.LayoutControlItem10.Text = "Regular Expression Test"
+ Me.LayoutControlItem10.TextSize = New System.Drawing.Size(122, 13)
+ '
+ 'SimpleButton1
+ '
+ Me.SimpleButton1.Location = New System.Drawing.Point(12, 212)
+ Me.SimpleButton1.Name = "SimpleButton1"
+ Me.SimpleButton1.Size = New System.Drawing.Size(776, 22)
+ Me.SimpleButton1.StyleController = Me.LayoutControl1
+ Me.SimpleButton1.TabIndex = 14
+ Me.SimpleButton1.Text = "Regular Expression prüfen"
+ '
+ 'LayoutControlItem11
+ '
+ Me.LayoutControlItem11.Control = Me.SimpleButton1
+ Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 200)
+ Me.LayoutControlItem11.Name = "LayoutControlItem11"
+ Me.LayoutControlItem11.Size = New System.Drawing.Size(780, 26)
+ Me.LayoutControlItem11.Text = "Regular Expression prüfen"
+ Me.LayoutControlItem11.TextSize = New System.Drawing.Size(0, 0)
+ Me.LayoutControlItem11.TextVisible = False
'
'frmAdmin_CWProfile
'
@@ -349,21 +448,28 @@ Partial Class frmAdmin_CWProfile
CType(Me.TBCW_PROFILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.LayoutControl1.ResumeLayout(False)
- CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtAddedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtAddedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit()
- CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem6, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.CheckEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.TextEdit4.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem9, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.TextEdit5.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
Me.PerformLayout()
@@ -398,4 +504,12 @@ Partial Class frmAdmin_CWProfile
Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem
Friend WithEvents labelStatus As DevExpress.XtraBars.BarStaticItem
Friend WithEvents labelError As DevExpress.XtraBars.BarStaticItem
+ Friend WithEvents CheckEdit1 As DevExpress.XtraEditors.CheckEdit
+ Friend WithEvents TextEdit4 As DevExpress.XtraEditors.TextEdit
+ Friend WithEvents TextEdit5 As DevExpress.XtraEditors.TextEdit
+ Friend WithEvents SimpleButton1 As DevExpress.XtraEditors.SimpleButton
+ Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents LayoutControlItem10 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents LayoutControlItem9 As DevExpress.XtraLayout.LayoutControlItem
+ Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem
End Class
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
index bab1b2a5..da101b92 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb
@@ -29,7 +29,6 @@ Partial Class frmAdmin_Start
Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAdmin_Start))
Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
- Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem4 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem5 = New DevExpress.XtraBars.BarButtonItem()
@@ -41,6 +40,7 @@ Partial Class frmAdmin_Start
Me.BarButtonItem7 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem8 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem9 = New DevExpress.XtraBars.BarButtonItem()
+ Me.BarButtonItem10 = New DevExpress.XtraBars.BarButtonItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPage_IDB = New DevExpress.XtraBars.Ribbon.RibbonPage()
@@ -71,22 +71,23 @@ Partial Class frmAdmin_Start
Me.XtraTabPage_IDB = New DevExpress.XtraTab.XtraTabPage()
Me.XtraTabControlIDB = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPageIDB_Attributes_New = New DevExpress.XtraTab.XtraTabPage()
- Me.TreeListIDBAttributes = New DevExpress.XtraTreeList.TreeList()
+ Me.TreeList_IDBAttributes = New DevExpress.XtraTreeList.TreeList()
Me.IDBImages = New DevExpress.Utils.SvgImageCollection(Me.components)
Me.XtraTabPageIDB_Entities = New DevExpress.XtraTab.XtraTabPage()
- Me.TreeListIDBEntities = New DevExpress.XtraTreeList.TreeList()
+ Me.TreeList_IDBEntities = New DevExpress.XtraTreeList.TreeList()
Me.XtraTabPage_GlobalIndexer = New DevExpress.XtraTab.XtraTabPage()
- Me.TreeListGLOBIXProfiles = New DevExpress.XtraTreeList.TreeList()
+ Me.TreeList_GLOBIXProfiles = New DevExpress.XtraTreeList.TreeList()
Me.GLOBIXImages = New DevExpress.Utils.SvgImageCollection(Me.components)
Me.XtraTabPage_ClipboardWatcher = New DevExpress.XtraTab.XtraTabPage()
Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl()
Me.XtraTabPageCWProfiles = New DevExpress.XtraTab.XtraTabPage()
- Me.TreeListCWProfiles = New DevExpress.XtraTreeList.TreeList()
+ Me.TreeList_CWProfiles = New DevExpress.XtraTreeList.TreeList()
Me.CWImages = New DevExpress.Utils.SvgImageCollection(Me.components)
Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
Me.XtraTabControl = New DevExpress.XtraTab.XtraTabControl()
Me.Panel1 = New System.Windows.Forms.Panel()
Me.labelTitle = New System.Windows.Forms.Label()
+ Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.TreeListMenu, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.MainTreeImages, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -100,18 +101,18 @@ Partial Class frmAdmin_Start
CType(Me.XtraTabControlIDB, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControlIDB.SuspendLayout()
Me.XtraTabPageIDB_Attributes_New.SuspendLayout()
- CType(Me.TreeListIDBAttributes, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.TreeList_IDBAttributes, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.IDBImages, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabPageIDB_Entities.SuspendLayout()
- CType(Me.TreeListIDBEntities, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.TreeList_IDBEntities, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabPage_GlobalIndexer.SuspendLayout()
- CType(Me.TreeListGLOBIXProfiles, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.TreeList_GLOBIXProfiles, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.GLOBIXImages, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabPage_ClipboardWatcher.SuspendLayout()
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl1.SuspendLayout()
Me.XtraTabPageCWProfiles.SuspendLayout()
- CType(Me.TreeListCWProfiles, System.ComponentModel.ISupportInitialize).BeginInit()
+ CType(Me.TreeList_CWProfiles, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.CWImages, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).BeginInit()
Me.XtraTabControl.SuspendLayout()
@@ -121,9 +122,9 @@ Partial Class frmAdmin_Start
'RibbonControl1
'
Me.RibbonControl1.ExpandCollapseItem.Id = 0
- Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9})
+ Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.labelStatus, Me.labelError, Me.BarButtonItemAddAttribute, Me.BarButtonItemRefreshAttribute, Me.BarButtonItem6, Me.BarButtonItem7, Me.BarButtonItem8, Me.BarButtonItem9, Me.BarButtonItem10})
Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
- Me.RibbonControl1.MaxItemId = 15
+ Me.RibbonControl1.MaxItemId = 16
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1, Me.RibbonPage_IDB, Me.RibbonPage_ClipboardWatcher, Me.RibbonPage_GlobalIndexer})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -139,13 +140,6 @@ Partial Class frmAdmin_Start
Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.BarButtonItem1.Name = "BarButtonItem1"
'
- 'BarButtonItem2
- '
- Me.BarButtonItem2.Caption = "Speichern"
- Me.BarButtonItem2.Id = 2
- Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
- Me.BarButtonItem2.Name = "BarButtonItem2"
- '
'BarButtonItem3
'
Me.BarButtonItem3.Caption = "Aktualisieren"
@@ -190,7 +184,7 @@ Partial Class frmAdmin_Start
'
'BarButtonItemAddAttribute
'
- Me.BarButtonItemAddAttribute.Caption = "Hinzufügen"
+ Me.BarButtonItemAddAttribute.Caption = "Neues Attribut"
Me.BarButtonItemAddAttribute.Id = 9
Me.BarButtonItemAddAttribute.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_addcircled1
Me.BarButtonItemAddAttribute.Name = "BarButtonItemAddAttribute"
@@ -232,6 +226,14 @@ Partial Class frmAdmin_Start
Me.BarButtonItem9.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.updatedataextract
Me.BarButtonItem9.Name = "BarButtonItem9"
'
+ 'BarButtonItem10
+ '
+ Me.BarButtonItem10.Caption = "Bearbeiten"
+ Me.BarButtonItem10.Id = 15
+ Me.BarButtonItem10.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.actions_edit1
+ Me.BarButtonItem10.Name = "BarButtonItem10"
+ Me.BarButtonItem10.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large
+ '
'RibbonPage1
'
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup2})
@@ -270,10 +272,10 @@ Partial Class frmAdmin_Start
'RibbonGroup_ClipboardWatcher_Profile
'
Me.RibbonGroup_ClipboardWatcher_Profile.ItemLinks.Add(Me.BarButtonItem1)
- Me.RibbonGroup_ClipboardWatcher_Profile.ItemLinks.Add(Me.BarButtonItem2)
+ Me.RibbonGroup_ClipboardWatcher_Profile.ItemLinks.Add(Me.BarButtonItem10)
+ Me.RibbonGroup_ClipboardWatcher_Profile.ItemLinks.Add(Me.BarButtonItem5)
Me.RibbonGroup_ClipboardWatcher_Profile.ItemLinks.Add(Me.BarButtonItem3)
Me.RibbonGroup_ClipboardWatcher_Profile.ItemLinks.Add(Me.BarButtonItem4)
- Me.RibbonGroup_ClipboardWatcher_Profile.ItemLinks.Add(Me.BarButtonItem5)
Me.RibbonGroup_ClipboardWatcher_Profile.Name = "RibbonGroup_ClipboardWatcher_Profile"
Me.RibbonGroup_ClipboardWatcher_Profile.Text = "Profil-Verwaltung"
'
@@ -448,20 +450,20 @@ Partial Class frmAdmin_Start
'
'XtraTabPageIDB_Attributes_New
'
- Me.XtraTabPageIDB_Attributes_New.Controls.Add(Me.TreeListIDBAttributes)
+ Me.XtraTabPageIDB_Attributes_New.Controls.Add(Me.TreeList_IDBAttributes)
Me.XtraTabPageIDB_Attributes_New.Name = "XtraTabPageIDB_Attributes_New"
Me.XtraTabPageIDB_Attributes_New.Size = New System.Drawing.Size(1124, 478)
Me.XtraTabPageIDB_Attributes_New.Text = "Attribute"
'
'TreeListIDBAttributes
'
- Me.TreeListIDBAttributes.Dock = System.Windows.Forms.DockStyle.Fill
- Me.TreeListIDBAttributes.Location = New System.Drawing.Point(0, 0)
- Me.TreeListIDBAttributes.MenuManager = Me.RibbonControl1
- Me.TreeListIDBAttributes.Name = "TreeListIDBAttributes"
- Me.TreeListIDBAttributes.Size = New System.Drawing.Size(1124, 478)
- Me.TreeListIDBAttributes.StateImageList = Me.IDBImages
- Me.TreeListIDBAttributes.TabIndex = 0
+ Me.TreeList_IDBAttributes.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.TreeList_IDBAttributes.Location = New System.Drawing.Point(0, 0)
+ Me.TreeList_IDBAttributes.MenuManager = Me.RibbonControl1
+ Me.TreeList_IDBAttributes.Name = "TreeListIDBAttributes"
+ Me.TreeList_IDBAttributes.Size = New System.Drawing.Size(1124, 478)
+ Me.TreeList_IDBAttributes.StateImageList = Me.IDBImages
+ Me.TreeList_IDBAttributes.TabIndex = 0
'
'IDBImages
'
@@ -470,24 +472,24 @@ Partial Class frmAdmin_Start
'
'XtraTabPageIDB_Entities
'
- Me.XtraTabPageIDB_Entities.Controls.Add(Me.TreeListIDBEntities)
+ Me.XtraTabPageIDB_Entities.Controls.Add(Me.TreeList_IDBEntities)
Me.XtraTabPageIDB_Entities.Name = "XtraTabPageIDB_Entities"
Me.XtraTabPageIDB_Entities.Size = New System.Drawing.Size(1124, 478)
Me.XtraTabPageIDB_Entities.Text = "Entitäten"
'
'TreeListIDBEntities
'
- Me.TreeListIDBEntities.Dock = System.Windows.Forms.DockStyle.Fill
- Me.TreeListIDBEntities.Location = New System.Drawing.Point(0, 0)
- Me.TreeListIDBEntities.MenuManager = Me.RibbonControl1
- Me.TreeListIDBEntities.Name = "TreeListIDBEntities"
- Me.TreeListIDBEntities.Size = New System.Drawing.Size(1124, 478)
- Me.TreeListIDBEntities.StateImageList = Me.IDBImages
- Me.TreeListIDBEntities.TabIndex = 0
+ Me.TreeList_IDBEntities.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.TreeList_IDBEntities.Location = New System.Drawing.Point(0, 0)
+ Me.TreeList_IDBEntities.MenuManager = Me.RibbonControl1
+ Me.TreeList_IDBEntities.Name = "TreeListIDBEntities"
+ Me.TreeList_IDBEntities.Size = New System.Drawing.Size(1124, 478)
+ Me.TreeList_IDBEntities.StateImageList = Me.IDBImages
+ Me.TreeList_IDBEntities.TabIndex = 0
'
'XtraTabPage_GlobalIndexer
'
- Me.XtraTabPage_GlobalIndexer.Controls.Add(Me.TreeListGLOBIXProfiles)
+ Me.XtraTabPage_GlobalIndexer.Controls.Add(Me.TreeList_GLOBIXProfiles)
Me.XtraTabPage_GlobalIndexer.Name = "XtraTabPage_GlobalIndexer"
Me.XtraTabPage_GlobalIndexer.PageVisible = False
Me.XtraTabPage_GlobalIndexer.Size = New System.Drawing.Size(1126, 501)
@@ -495,14 +497,14 @@ Partial Class frmAdmin_Start
'
'TreeListGLOBIXProfiles
'
- Me.TreeListGLOBIXProfiles.Dock = System.Windows.Forms.DockStyle.Fill
- Me.TreeListGLOBIXProfiles.Location = New System.Drawing.Point(0, 0)
- Me.TreeListGLOBIXProfiles.MenuManager = Me.RibbonControl1
- Me.TreeListGLOBIXProfiles.Name = "TreeListGLOBIXProfiles"
- Me.TreeListGLOBIXProfiles.PreviewFieldName = "Title"
- Me.TreeListGLOBIXProfiles.Size = New System.Drawing.Size(1126, 501)
- Me.TreeListGLOBIXProfiles.StateImageList = Me.GLOBIXImages
- Me.TreeListGLOBIXProfiles.TabIndex = 0
+ Me.TreeList_GLOBIXProfiles.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.TreeList_GLOBIXProfiles.Location = New System.Drawing.Point(0, 0)
+ Me.TreeList_GLOBIXProfiles.MenuManager = Me.RibbonControl1
+ Me.TreeList_GLOBIXProfiles.Name = "TreeListGLOBIXProfiles"
+ Me.TreeList_GLOBIXProfiles.PreviewFieldName = "Title"
+ Me.TreeList_GLOBIXProfiles.Size = New System.Drawing.Size(1126, 501)
+ Me.TreeList_GLOBIXProfiles.StateImageList = Me.GLOBIXImages
+ Me.TreeList_GLOBIXProfiles.TabIndex = 0
'
'GLOBIXImages
'
@@ -530,23 +532,23 @@ Partial Class frmAdmin_Start
'
'XtraTabPageCWProfiles
'
- Me.XtraTabPageCWProfiles.Controls.Add(Me.TreeListCWProfiles)
+ Me.XtraTabPageCWProfiles.Controls.Add(Me.TreeList_CWProfiles)
Me.XtraTabPageCWProfiles.Name = "XtraTabPageCWProfiles"
Me.XtraTabPageCWProfiles.Size = New System.Drawing.Size(1124, 478)
Me.XtraTabPageCWProfiles.Text = "Profile"
'
'TreeListCWProfiles
'
- Me.TreeListCWProfiles.Dock = System.Windows.Forms.DockStyle.Fill
- Me.TreeListCWProfiles.KeyFieldName = ""
- Me.TreeListCWProfiles.Location = New System.Drawing.Point(0, 0)
- Me.TreeListCWProfiles.MenuManager = Me.RibbonControl1
- Me.TreeListCWProfiles.Name = "TreeListCWProfiles"
- Me.TreeListCWProfiles.OptionsView.ShowIndentAsRowStyle = True
- Me.TreeListCWProfiles.ParentFieldName = ""
- Me.TreeListCWProfiles.Size = New System.Drawing.Size(1124, 478)
- Me.TreeListCWProfiles.StateImageList = Me.CWImages
- Me.TreeListCWProfiles.TabIndex = 2
+ Me.TreeList_CWProfiles.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.TreeList_CWProfiles.KeyFieldName = ""
+ Me.TreeList_CWProfiles.Location = New System.Drawing.Point(0, 0)
+ Me.TreeList_CWProfiles.MenuManager = Me.RibbonControl1
+ Me.TreeList_CWProfiles.Name = "TreeListCWProfiles"
+ Me.TreeList_CWProfiles.OptionsView.ShowIndentAsRowStyle = True
+ Me.TreeList_CWProfiles.ParentFieldName = ""
+ Me.TreeList_CWProfiles.Size = New System.Drawing.Size(1124, 478)
+ Me.TreeList_CWProfiles.StateImageList = Me.CWImages
+ Me.TreeList_CWProfiles.TabIndex = 2
'
'CWImages
'
@@ -593,6 +595,13 @@ Partial Class frmAdmin_Start
Me.labelTitle.Text = "labelTitle"
Me.labelTitle.TextAlign = System.Drawing.ContentAlignment.MiddleLeft
'
+ 'BarButtonItem2
+ '
+ Me.BarButtonItem2.Caption = "Speichern"
+ Me.BarButtonItem2.Id = 2
+ Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+ Me.BarButtonItem2.Name = "BarButtonItem2"
+ '
'frmAdmin_Start
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -621,18 +630,18 @@ Partial Class frmAdmin_Start
CType(Me.XtraTabControlIDB, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControlIDB.ResumeLayout(False)
Me.XtraTabPageIDB_Attributes_New.ResumeLayout(False)
- CType(Me.TreeListIDBAttributes, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.TreeList_IDBAttributes, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.IDBImages, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabPageIDB_Entities.ResumeLayout(False)
- CType(Me.TreeListIDBEntities, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.TreeList_IDBEntities, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabPage_GlobalIndexer.ResumeLayout(False)
- CType(Me.TreeListGLOBIXProfiles, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.TreeList_GLOBIXProfiles, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.GLOBIXImages, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabPage_ClipboardWatcher.ResumeLayout(False)
CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl1.ResumeLayout(False)
Me.XtraTabPageCWProfiles.ResumeLayout(False)
- CType(Me.TreeListCWProfiles, System.ComponentModel.ISupportInitialize).EndInit()
+ CType(Me.TreeList_CWProfiles, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.CWImages, System.ComponentModel.ISupportInitialize).EndInit()
CType(Me.XtraTabControl, System.ComponentModel.ISupportInitialize).EndInit()
Me.XtraTabControl.ResumeLayout(False)
@@ -656,7 +665,6 @@ Partial Class frmAdmin_Start
Friend WithEvents RibbonGroup_ClipboardWatcher_Window As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents RibbonGroup_ClipboardWatcher_Control As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
- Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
@@ -696,13 +704,15 @@ Partial Class frmAdmin_Start
Friend WithEvents XtraTabPageCWProfiles As DevExpress.XtraTab.XtraTabPage
Friend WithEvents XtraTabPage2 As DevExpress.XtraTab.XtraTabPage
Friend WithEvents CWImages As DevExpress.Utils.SvgImageCollection
- Friend WithEvents TreeListGLOBIXProfiles As DevExpress.XtraTreeList.TreeList
+ Friend WithEvents TreeList_GLOBIXProfiles As DevExpress.XtraTreeList.TreeList
Friend WithEvents GLOBIXImages As DevExpress.Utils.SvgImageCollection
- Friend WithEvents TreeListCWProfiles As DevExpress.XtraTreeList.TreeList
+ Friend WithEvents TreeList_CWProfiles As DevExpress.XtraTreeList.TreeList
Friend WithEvents Panel1 As Panel
Friend WithEvents labelTitle As Label
- Friend WithEvents TreeListIDBAttributes As DevExpress.XtraTreeList.TreeList
+ Friend WithEvents TreeList_IDBAttributes As DevExpress.XtraTreeList.TreeList
Friend WithEvents XtraTabPageIDB_Entities As DevExpress.XtraTab.XtraTabPage
- Friend WithEvents TreeListIDBEntities As DevExpress.XtraTreeList.TreeList
+ Friend WithEvents TreeList_IDBEntities As DevExpress.XtraTreeList.TreeList
Friend WithEvents IDBImages As DevExpress.Utils.SvgImageCollection
+ Friend WithEvents BarButtonItem10 As DevExpress.XtraBars.BarButtonItem
+ Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
End Class
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx
index 1372970a..c570cbab 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.resx
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.resx
@@ -134,22 +134,6 @@
QzkuNCw0LDQsOS40LDQsMTZzNS40LDEyLDEyLDEyczEyLTUuNCwxMi0xMlMyMi42LDQsMTYsNHogTTI0
LDE4aC02djZoLTR2LTZIOHYtNGg2VjhoNHY2aDZWMTh6IiBjbGFzcz0iR3JlZW4iIC8+DQogIDwvZz4N
Cjwvc3ZnPgs=
-
-
-
-
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
- MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
- bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww
- LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt
- NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si
- IC8+DQo8L3N2Zz4L
@@ -270,15 +254,18 @@
122, 17
-
- 122, 17
-
396, 17
531, 56
+
+ 17, 17
+
+
+ 264, 17
+
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
@@ -308,9 +295,6 @@
531, 17
-
- 531, 17
-
919, 17
@@ -323,19 +307,20 @@
277, 56
-
- 531, 56
-
-
- 264, 17
-
-
- 264, 17
-
-
- 17, 17
-
-
- 17, 17
-
+
+
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAO4BAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iU2F2ZSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAgMzIg
+ MzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cjwvc3R5
+ bGU+DQogIDxwYXRoIGQ9Ik0yNyw0aC0zdjEwSDhWNEg1QzQuNCw0LDQsNC40LDQsNXYyMmMwLDAuNiww
+ LjQsMSwxLDFoMjJjMC42LDAsMS0wLjQsMS0xVjVDMjgsNC40LDI3LjYsNCwyNyw0eiBNMjQsMjRIOHYt
+ NiAgaDE2VjI0eiBNMTAsNHY4aDEwVjRIMTB6IE0xNCwxMGgtMlY2aDJWMTB6IiBjbGFzcz0iQmxhY2si
+ IC8+DQo8L3N2Zz4L
+
+
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
index 7b409ec3..89b8f72d 100644
--- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
+++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb
@@ -42,6 +42,7 @@ Public Class frmAdmin_Start
Public Property Entity As String
Public Property Scope As String
Public Property Summary As String
+ Public Property Active As Boolean
'''
''' The GUID coming from the Database starts with a 3-char long identifier that needs to be removed
@@ -62,10 +63,10 @@ Public Class frmAdmin_Start
TreeListMenu.ExpandAll()
- AddHandler TreeListIDBAttributes.DoubleClick, AddressOf TreeList_DoubleClick
- AddHandler TreeListIDBEntities.DoubleClick, AddressOf TreeList_DoubleClick
- AddHandler TreeListCWProfiles.DoubleClick, AddressOf TreeList_DoubleClick
- AddHandler TreeListGLOBIXProfiles.DoubleClick, AddressOf TreeList_DoubleClick
+ AddHandler TreeList_IDBAttributes.DoubleClick, AddressOf TreeList_DoubleClick
+ AddHandler TreeList_IDBEntities.DoubleClick, AddressOf TreeList_DoubleClick
+ AddHandler TreeList_CWProfiles.DoubleClick, AddressOf TreeList_DoubleClick
+ AddHandler TreeList_GLOBIXProfiles.DoubleClick, AddressOf TreeList_DoubleClick
' Show Tab Header in Development, hide when running the app
XtraTabControl.ShowTabHeader = DefaultBoolean.False
@@ -83,7 +84,8 @@ Public Class frmAdmin_Start
.Entity = oRow.Item("ENTITY").ToString,
.Scope = oRow.Item("ENTITY_SCOPE").ToString,
.Title = oRow.Item("NODE_TITLE").ToString,
- .Summary = oRow.Item("SUMMARY").ToString
+ .Summary = oRow.Item("SUMMARY").ToString,
+ .Active = oRow.Item("ACTIVE")
}
AdminItems.Add(oItem)
@@ -145,7 +147,7 @@ Public Class frmAdmin_Start
Display_Tab(XtraTabPageIDB_Attributes_New)
Dim oItems As List(Of AdminItem) = AdminItems.Where(AddressOf IsIDBAttribute).ToList()
- Load_Tree(oItems, TreeListIDBAttributes)
+ Load_Tree(oItems, TreeList_IDBAttributes)
Case IDB_BUSINESS_ENTITIES
labelTitle.Text = "IDB Entitäten"
@@ -153,7 +155,7 @@ Public Class frmAdmin_Start
Display_Tab(XtraTabPageIDB_Entities)
Dim oItems As List(Of AdminItem) = AdminItems.Where(AddressOf IsIDBEntity).ToList()
- Load_Tree(oItems, TreeListIDBEntities)
+ Load_Tree(oItems, TreeList_IDBEntities)
Case GLOBIX_PROFILES
labelTitle.Text = "Global Indexer Profile"
@@ -161,7 +163,7 @@ Public Class frmAdmin_Start
Display_RibbonPage(RibbonPage_GlobalIndexer)
Dim oItems As List(Of AdminItem) = AdminItems.Where(AddressOf IsGLOBIXItem).ToList()
- Load_Tree(oItems, TreeListGLOBIXProfiles)
+ Load_Tree(oItems, TreeList_GLOBIXProfiles)
Case CW_PROFILES
labelTitle.Text = "Clipboard Watcher Profile"
@@ -170,7 +172,7 @@ Public Class frmAdmin_Start
Display_RibbonPage(RibbonPage_ClipboardWatcher)
Dim oItems As List(Of AdminItem) = AdminItems.Where(AddressOf IsCWItem).ToList()
- Load_Tree(oItems, TreeListCWProfiles)
+ Load_Tree(oItems, TreeList_CWProfiles)
End Select
Catch ex As Exception
@@ -200,6 +202,13 @@ Public Class frmAdmin_Start
.FieldName = "Summary",
.Visible = True,
.VisibleIndex = 2
+ },
+ New Columns.TreeListColumn() With {
+ .Name = "columnActive",
+ .Caption = "Aktiv",
+ .FieldName = "Active",
+ .Visible = True,
+ .VisibleIndex = 3
}
}
@@ -262,11 +271,14 @@ Public Class frmAdmin_Start
Dim oItem As AdminItem = oView.GetFocusedRow
If oItem IsNot Nothing Then
Select Case oView.Name
- Case TreeListIDBAttributes.Name
+ Case TreeList_IDBAttributes.Name
Load_IDBAttribute(oItem.RealGuid)
- Case TreeListIDBEntities.Name
+ Case TreeList_IDBEntities.Name
Load_IDBEntity(oItem.RealGuid)
+
+ Case TreeList_CWProfiles.Name
+ Load_CWProfile(oItem.RealGuid)
End Select
End If
Catch ex As Exception
@@ -283,7 +295,7 @@ Public Class frmAdmin_Start
If oForm.HasChanges Then
Load_SQLData()
Dim oItems As List(Of AdminItem) = AdminItems.Where(AddressOf IsIDBAttribute).ToList
- Load_Tree(oItems, TreeListIDBAttributes)
+ Load_Tree(oItems, TreeList_IDBAttributes)
End If
Catch ex As Exception
ShowError(ex)
@@ -298,7 +310,7 @@ Public Class frmAdmin_Start
If oForm.HasChanges Then
Load_SQLData()
Dim oItems As List(Of AdminItem) = AdminItems.Where(AddressOf IsIDBEntity).ToList
- Load_Tree(oItems, TreeListIDBEntities)
+ Load_Tree(oItems, TreeList_IDBEntities)
End If
Catch ex As Exception
ShowError(ex)
@@ -311,10 +323,10 @@ Public Class frmAdmin_Start
oForm.ShowDialog()
If oForm.HasChanges Then
+ Load_SQLData()
+ Dim oItems As List(Of AdminItem) = AdminItems.Where(AddressOf IsCWItem).ToList
- Dim oSource As AdminItem = AdminItems.Item(CurrentPage)
- Dim oTable As DataTable = My.Database.GetDatatable(oSource.Title)
- 'Load_Tree(oTable, oSource, TreeList1)
+ Load_Tree(oItems, TreeList_CWProfiles)
End If
Catch ex As Exception
ShowError(ex)
@@ -323,7 +335,7 @@ Public Class frmAdmin_Start
Private Sub BarButtonItem7_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem7.ItemClick
Try
- Dim oRow As DataRow = TreeListIDBAttributes.GetFocusedDataRow
+ Dim oRow As DataRow = TreeList_IDBAttributes.GetFocusedDataRow
If oRow IsNot Nothing Then
Dim oPrimaryKey As Integer = DirectCast(oRow.Item(PrimaryKey), Integer)
Load_IDBAttribute(oPrimaryKey)
@@ -349,7 +361,7 @@ Public Class frmAdmin_Start
- Private Sub TreeList1_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeListCWProfiles.GetStateImage
+ Private Sub TreeList1_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList_CWProfiles.GetStateImage
Dim oTreeList As TreeList = DirectCast(sender, TreeList)
Dim oItem As AdminItem = DirectCast(oTreeList.GetRow(e.Node.Id), AdminItem)
@@ -369,7 +381,7 @@ Public Class frmAdmin_Start
End Sub
- Private Sub TreeList2_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeListGLOBIXProfiles.GetStateImage
+ Private Sub TreeList2_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList_GLOBIXProfiles.GetStateImage
Dim oTreeList As TreeList = DirectCast(sender, TreeList)
Dim oItem As AdminItem = DirectCast(oTreeList.GetRow(e.Node.Id), AdminItem)
@@ -387,11 +399,11 @@ Public Class frmAdmin_Start
End Sub
- Private Sub TreeListIDBAttributes_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeListIDBAttributes.GetStateImage
+ Private Sub TreeListIDBAttributes_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList_IDBAttributes.GetStateImage
e.NodeImageIndex = 1
End Sub
- Private Sub TreeListIDBEntities_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeListIDBEntities.GetStateImage
+ Private Sub TreeListIDBEntities_GetStateImage(sender As Object, e As GetStateImageEventArgs) Handles TreeList_IDBEntities.GetStateImage
e.NodeImageIndex = 0
End Sub
End Class
\ No newline at end of file
diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb
index e6b952ff..e271af62 100644
--- a/GUIs.ZooFlow/My Project/Resources.Designer.vb
+++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb
@@ -210,6 +210,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+ '''
+ Friend ReadOnly Property about3() As DevExpress.Utils.Svg.SvgImage
+ Get
+ Dim obj As Object = ResourceManager.GetObject("about3", resourceCulture)
+ Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''
@@ -290,6 +300,16 @@ Namespace My.Resources
End Get
End Property
+ '''
+ ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+ '''
+ Friend ReadOnly Property actions_edit1() As DevExpress.Utils.Svg.SvgImage
+ Get
+ Dim obj As Object = ResourceManager.GetObject("actions_edit1", resourceCulture)
+ Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+ End Get
+ End Property
+
'''
''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
'''
diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx
index c96c888a..a9077920 100644
--- a/GUIs.ZooFlow/My Project/Resources.resx
+++ b/GUIs.ZooFlow/My Project/Resources.resx
@@ -118,8 +118,8 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\bell_go.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -127,8 +127,8 @@
..\Resources\4_GLOBIX_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\ZooFlow-25.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
@@ -154,8 +154,11 @@
..\Resources\DD_Icons_ICO_PMANAGER_128px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -166,6 +169,9 @@
..\Resources\about1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ..\Resources\ZooflowTitle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -181,8 +187,8 @@
..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\CW_klein.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\2_LUPE_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -196,6 +202,9 @@
..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\1_LOGO_ZOO_FLOW_DROP3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -226,8 +235,8 @@
..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
- ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\bo_appointment.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
..\Resources\3_PERSON_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -262,16 +271,13 @@
..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
- ..\Resources\ZooflowTitle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\bo_appointment.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-
-
- ..\Resources\about2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ ..\Resources\about3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Resources/about3.svg b/GUIs.ZooFlow/Resources/about3.svg
new file mode 100644
index 00000000..1f67213d
--- /dev/null
+++ b/GUIs.ZooFlow/Resources/about3.svg
@@ -0,0 +1,19 @@
+
+
\ No newline at end of file
diff --git a/GUIs.ZooFlow/Resources/actions_edit1.svg b/GUIs.ZooFlow/Resources/actions_edit1.svg
new file mode 100644
index 00000000..89aa31c7
--- /dev/null
+++ b/GUIs.ZooFlow/Resources/actions_edit1.svg
@@ -0,0 +1,17 @@
+
+
\ No newline at end of file
diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj
index 912138a8..fadfbda1 100644
--- a/GUIs.ZooFlow/ZooFlow.vbproj
+++ b/GUIs.ZooFlow/ZooFlow.vbproj
@@ -598,6 +598,12 @@
+
+
+
+
+
+