From d6ad9b56e1979fb673ce32ee4aa2867896df6d37 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 15 Mar 2022 13:31:35 +0100 Subject: [PATCH] Common: create ctrlObjectProperties, embed in DocumentResultList --- GUIs.Common/My Project/licenses.licx | 11 +- .../ObjectPropertyDialog/AttributeControls.vb | 2 + .../ctrlObjectPropertyDialog.Designer.vb | 571 +++++++++++------- .../ctrlObjectPropertyDialog.resx | 6 + .../ctrlObjectPropertyDialog.vb | 187 +++++- .../frmObjectPropertyDialog.vb | 4 + GUIs.Common/frmDocumentResultList.Designer.vb | 216 +------ GUIs.Common/frmDocumentResultList.resx | 236 +------- GUIs.Common/frmDocumentResultList.vb | 6 +- GUIs.Test.TestGUI/TestGUI.vbproj | 9 + .../frmObjectProperties.Designer.vb | 48 ++ GUIs.Test.TestGUI/frmObjectProperties.resx | 120 ++++ GUIs.Test.TestGUI/frmObjectProperties.vb | 24 + GUIs.Test.TestGUI/frmStart.Designer.vb | 12 + GUIs.Test.TestGUI/frmStart.vb | 5 + 15 files changed, 783 insertions(+), 674 deletions(-) create mode 100644 GUIs.Test.TestGUI/frmObjectProperties.Designer.vb create mode 100644 GUIs.Test.TestGUI/frmObjectProperties.resx create mode 100644 GUIs.Test.TestGUI/frmObjectProperties.vb diff --git a/GUIs.Common/My Project/licenses.licx b/GUIs.Common/My Project/licenses.licx index 3c8716d5..d8909bca 100644 --- a/GUIs.Common/My Project/licenses.licx +++ b/GUIs.Common/My Project/licenses.licx @@ -1,8 +1,9 @@ -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb b/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb index d99cedc5..370a17b2 100644 --- a/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb +++ b/GUIs.Common/ObjectPropertyDialog/AttributeControls.vb @@ -70,6 +70,8 @@ Public Class AttributeControls For Each oAttribute As Attribute In pAttributes Dim oEditable = ShouldControlBeEditable(oAttribute) Dim oControl = GetControlForAttribute(oAttribute, Not oEditable) + + ' Add new control Dim oItem As LayoutControlItem = LayoutRoot.AddItem() oItem.Text = oAttribute.Title diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb index 99eb43cb..e0e5f091 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.Designer.vb @@ -22,30 +22,26 @@ Partial Class ctrlObjectPropertyDialog 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() + Dim BarStaticItem1 As DevExpress.XtraBars.BarStaticItem Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageObject = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() - Me.ProgressBarControl1 = New DevExpress.XtraEditors.ProgressBarControl() - Me.RootMetadata = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() - Me.lbLifecycleStart = New DevExpress.XtraLayout.SimpleLabelItem() - Me.lbLifecycleEnd = New DevExpress.XtraLayout.SimpleLabelItem() - Me.XtraTabPageAttributes = New DevExpress.XtraTab.XtraTabPage() - Me.XtraTabPageAttributeHistory = New DevExpress.XtraTab.XtraTabPage() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridObjectHistory = New DevExpress.XtraGrid.GridControl() Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() - Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.txtCreatedWho = New DevExpress.XtraEditors.TextEdit() - Me.TextEdit11 = New DevExpress.XtraEditors.TextEdit() - Me.txtAccessedWhen = New DevExpress.XtraEditors.TextEdit() + Me.progressLifecycle = New DevExpress.XtraEditors.ProgressBarControl() Me.txtObjectId = New DevExpress.XtraEditors.TextEdit() - Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() Me.txtCreatedWhen = New DevExpress.XtraEditors.TextEdit() + Me.txtCreatedWho = New DevExpress.XtraEditors.TextEdit() Me.txtChangedWho = New DevExpress.XtraEditors.TextEdit() + Me.txtChangedWhen = New DevExpress.XtraEditors.TextEdit() + Me.txtAccessedWhen = New DevExpress.XtraEditors.TextEdit() + Me.TextEdit11 = New DevExpress.XtraEditors.TextEdit() + Me.RootMetadata = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() + Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem() @@ -53,36 +49,45 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControlItem7 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem8 = New DevExpress.XtraLayout.LayoutControlItem() Me.txtAccessedWho = New DevExpress.XtraLayout.LayoutControlItem() - Me.GridControl2 = New DevExpress.XtraGrid.GridControl() - Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() + Me.lbLifecycleStart = New DevExpress.XtraLayout.SimpleLabelItem() + Me.lbLifecycleEnd = New DevExpress.XtraLayout.SimpleLabelItem() + Me.XtraTabPageAttributes = New DevExpress.XtraTab.XtraTabPage() Me.LayoutControl2 = New DevExpress.XtraLayout.LayoutControl() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() + Me.XtraTabPageAttributeHistory = New DevExpress.XtraTab.XtraTabPage() + Me.GridValueHistory = New DevExpress.XtraGrid.GridControl() + Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) + Me.d = New DevExpress.XtraBars.Bar() + Me.cmbEntityId = New DevExpress.XtraBars.BarEditItem() + Me.cmbEntityIdInner = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox() + Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl() + Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl() + BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.XtraTabControl1.SuspendLayout() Me.XtraTabPageObject.SuspendLayout() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.LayoutControl1.SuspendLayout() - CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabPageAttributes.SuspendLayout() - Me.XtraTabPageAttributeHistory.SuspendLayout() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridObjectHistory, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.progressLifecycle.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).BeginInit() @@ -90,20 +95,35 @@ Partial Class ctrlObjectPropertyDialog CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabPageAttributes.SuspendLayout() CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() + Me.XtraTabPageAttributeHistory.SuspendLayout() + CType(Me.GridValueHistory, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.cmbEntityIdInner, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' + 'BarStaticItem1 + ' + BarStaticItem1.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + BarStaticItem1.Caption = "BE" + BarStaticItem1.Id = 1 + BarStaticItem1.Name = "BarStaticItem1" + ' 'XtraTabControl1 ' Me.XtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.XtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Bottom - Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0) + Me.XtraTabControl1.Location = New System.Drawing.Point(0, 30) Me.XtraTabControl1.Name = "XtraTabControl1" Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageObject - Me.XtraTabControl1.Size = New System.Drawing.Size(505, 723) + Me.XtraTabControl1.Size = New System.Drawing.Size(505, 693) Me.XtraTabControl1.TabIndex = 2 Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageObject, Me.XtraTabPageAttributes, Me.XtraTabPageAttributeHistory}) ' @@ -111,13 +131,13 @@ Partial Class ctrlObjectPropertyDialog ' Me.XtraTabPageObject.Controls.Add(Me.LayoutControl1) Me.XtraTabPageObject.Name = "XtraTabPageObject" - Me.XtraTabPageObject.Size = New System.Drawing.Size(503, 698) + Me.XtraTabPageObject.Size = New System.Drawing.Size(503, 668) Me.XtraTabPageObject.Text = "Objekt" ' 'LayoutControl1 ' - Me.LayoutControl1.Controls.Add(Me.GridControl1) - Me.LayoutControl1.Controls.Add(Me.ProgressBarControl1) + Me.LayoutControl1.Controls.Add(Me.GridObjectHistory) + Me.LayoutControl1.Controls.Add(Me.progressLifecycle) Me.LayoutControl1.Controls.Add(Me.txtObjectId) Me.LayoutControl1.Controls.Add(Me.txtCreatedWhen) Me.LayoutControl1.Controls.Add(Me.txtCreatedWho) @@ -130,126 +150,53 @@ Partial Class ctrlObjectPropertyDialog Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1068, 351, 650, 400) Me.LayoutControl1.Root = Me.RootMetadata - Me.LayoutControl1.Size = New System.Drawing.Size(503, 698) + Me.LayoutControl1.Size = New System.Drawing.Size(503, 668) Me.LayoutControl1.TabIndex = 0 Me.LayoutControl1.Text = "LayoutControl1" ' - 'ProgressBarControl1 - ' - Me.ProgressBarControl1.Location = New System.Drawing.Point(24, 656) - Me.ProgressBarControl1.Name = "ProgressBarControl1" - Me.ProgressBarControl1.Size = New System.Drawing.Size(455, 18) - Me.ProgressBarControl1.StyleController = Me.LayoutControl1 - Me.ProgressBarControl1.TabIndex = 7 - ' - 'RootMetadata - ' - Me.RootMetadata.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.RootMetadata.GroupBordersVisible = False - Me.RootMetadata.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.LayoutControlGroup2, Me.LayoutControlGroup3}) - Me.RootMetadata.Name = "Root" - Me.RootMetadata.Size = New System.Drawing.Size(503, 698) - Me.RootMetadata.TextVisible = False - ' - 'LayoutControlGroup1 - ' - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 232) - Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(483, 346) - Me.LayoutControlGroup1.Text = "Objekt Historie" - ' - 'LayoutControlGroup2 - ' - Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem1, Me.LayoutControlItem1, Me.LayoutControlItem3, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.txtAccessedWho}) - Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(483, 232) - Me.LayoutControlGroup2.Text = "Eigenschaften" - ' - 'LayoutControlGroup3 - ' - Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.lbLifecycleStart, Me.lbLifecycleEnd}) - Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 578) - Me.LayoutControlGroup3.Name = "LayoutControlGroup3" - Me.LayoutControlGroup3.Size = New System.Drawing.Size(483, 100) - Me.LayoutControlGroup3.Text = "Lebenszyklus" - ' - 'LayoutControlItem4 - ' - Me.LayoutControlItem4.Control = Me.ProgressBarControl1 - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 33) - Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(459, 22) - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem4.TextVisible = False - ' - 'lbLifecycleStart - ' - Me.lbLifecycleStart.AllowHotTrack = False - Me.lbLifecycleStart.Location = New System.Drawing.Point(0, 0) - Me.lbLifecycleStart.Name = "lbLifecycleStart" - Me.lbLifecycleStart.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.lbLifecycleStart.Size = New System.Drawing.Size(229, 33) - Me.lbLifecycleStart.Text = "00.00.0000" - Me.lbLifecycleStart.TextSize = New System.Drawing.Size(70, 13) - ' - 'lbLifecycleEnd - ' - Me.lbLifecycleEnd.AllowHotTrack = False - Me.lbLifecycleEnd.AppearanceItemCaption.Options.UseTextOptions = True - Me.lbLifecycleEnd.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far - Me.lbLifecycleEnd.Location = New System.Drawing.Point(229, 0) - Me.lbLifecycleEnd.Name = "lbLifecycleEnd" - Me.lbLifecycleEnd.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.lbLifecycleEnd.Size = New System.Drawing.Size(230, 33) - Me.lbLifecycleEnd.Text = "99.99.9999" - Me.lbLifecycleEnd.TextSize = New System.Drawing.Size(70, 13) - ' - 'XtraTabPageAttributes - ' - Me.XtraTabPageAttributes.Controls.Add(Me.LayoutControl2) - Me.XtraTabPageAttributes.Name = "XtraTabPageAttributes" - Me.XtraTabPageAttributes.Size = New System.Drawing.Size(503, 698) - Me.XtraTabPageAttributes.Text = "Attribute" - ' - 'XtraTabPageAttributeHistory - ' - Me.XtraTabPageAttributeHistory.Controls.Add(Me.GridControl2) - Me.XtraTabPageAttributeHistory.Name = "XtraTabPageAttributeHistory" - Me.XtraTabPageAttributeHistory.Size = New System.Drawing.Size(503, 698) - Me.XtraTabPageAttributeHistory.Text = "Attribut Historie" - ' - 'GridControl1 + 'GridObjectHistory ' - Me.GridControl1.Location = New System.Drawing.Point(24, 277) - Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(455, 297) - Me.GridControl1.TabIndex = 9 - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + Me.GridObjectHistory.Location = New System.Drawing.Point(24, 267) + Me.GridObjectHistory.MainView = Me.GridView1 + Me.GridObjectHistory.Name = "GridObjectHistory" + Me.GridObjectHistory.Size = New System.Drawing.Size(455, 281) + Me.GridObjectHistory.TabIndex = 9 + Me.GridObjectHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) ' 'GridView1 ' - Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.GridControl = Me.GridObjectHistory Me.GridView1.Name = "GridView1" ' - 'LayoutControlItem2 + 'progressLifecycle ' - Me.LayoutControlItem2.Control = Me.GridControl1 - Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(459, 301) - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem2.TextVisible = False + Me.progressLifecycle.Location = New System.Drawing.Point(24, 630) + Me.progressLifecycle.Name = "progressLifecycle" + Me.progressLifecycle.Size = New System.Drawing.Size(455, 14) + Me.progressLifecycle.StyleController = Me.LayoutControl1 + Me.progressLifecycle.TabIndex = 7 ' - 'EmptySpaceItem1 + 'txtObjectId ' - Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 120) - Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(459, 67) - Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) + Me.txtObjectId.Location = New System.Drawing.Point(109, 48) + Me.txtObjectId.Name = "txtObjectId" + Me.txtObjectId.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtObjectId.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtObjectId.Properties.ReadOnly = True + Me.txtObjectId.Size = New System.Drawing.Size(367, 20) + Me.txtObjectId.StyleController = Me.LayoutControl1 + Me.txtObjectId.TabIndex = 7 + ' + 'txtCreatedWhen + ' + Me.txtCreatedWhen.Location = New System.Drawing.Point(109, 78) + Me.txtCreatedWhen.Name = "txtCreatedWhen" + Me.txtCreatedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtCreatedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtCreatedWhen.Properties.ReadOnly = True + Me.txtCreatedWhen.Size = New System.Drawing.Size(137, 20) + Me.txtCreatedWhen.StyleController = Me.LayoutControl1 + Me.txtCreatedWhen.TabIndex = 4 ' 'txtCreatedWho ' @@ -262,16 +209,27 @@ Partial Class ctrlObjectPropertyDialog Me.txtCreatedWho.StyleController = Me.LayoutControl1 Me.txtCreatedWho.TabIndex = 8 ' - 'TextEdit11 + 'txtChangedWho ' - Me.TextEdit11.Location = New System.Drawing.Point(338, 138) - Me.TextEdit11.Name = "TextEdit11" - Me.TextEdit11.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White - Me.TextEdit11.Properties.AppearanceReadOnly.Options.UseBackColor = True - Me.TextEdit11.Properties.ReadOnly = True - Me.TextEdit11.Size = New System.Drawing.Size(138, 20) - Me.TextEdit11.StyleController = Me.LayoutControl1 - Me.TextEdit11.TabIndex = 10 + Me.txtChangedWho.Location = New System.Drawing.Point(338, 108) + Me.txtChangedWho.Name = "txtChangedWho" + Me.txtChangedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtChangedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtChangedWho.Properties.ReadOnly = True + Me.txtChangedWho.Size = New System.Drawing.Size(138, 20) + Me.txtChangedWho.StyleController = Me.LayoutControl1 + Me.txtChangedWho.TabIndex = 9 + ' + 'txtChangedWhen + ' + Me.txtChangedWhen.Location = New System.Drawing.Point(109, 108) + Me.txtChangedWhen.Name = "txtChangedWhen" + Me.txtChangedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.txtChangedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.txtChangedWhen.Properties.ReadOnly = True + Me.txtChangedWhen.Size = New System.Drawing.Size(137, 20) + Me.txtChangedWhen.StyleController = Me.LayoutControl1 + Me.txtChangedWhen.TabIndex = 5 ' 'txtAccessedWhen ' @@ -284,49 +242,58 @@ Partial Class ctrlObjectPropertyDialog Me.txtAccessedWhen.StyleController = Me.LayoutControl1 Me.txtAccessedWhen.TabIndex = 6 ' - 'txtObjectId + 'TextEdit11 ' - Me.txtObjectId.Location = New System.Drawing.Point(109, 48) - Me.txtObjectId.Name = "txtObjectId" - Me.txtObjectId.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White - Me.txtObjectId.Properties.AppearanceReadOnly.Options.UseBackColor = True - Me.txtObjectId.Properties.ReadOnly = True - Me.txtObjectId.Size = New System.Drawing.Size(367, 20) - Me.txtObjectId.StyleController = Me.LayoutControl1 - Me.txtObjectId.TabIndex = 7 + Me.TextEdit11.Location = New System.Drawing.Point(338, 138) + Me.TextEdit11.Name = "TextEdit11" + Me.TextEdit11.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White + Me.TextEdit11.Properties.AppearanceReadOnly.Options.UseBackColor = True + Me.TextEdit11.Properties.ReadOnly = True + Me.TextEdit11.Size = New System.Drawing.Size(138, 20) + Me.TextEdit11.StyleController = Me.LayoutControl1 + Me.TextEdit11.TabIndex = 10 ' - 'txtChangedWhen + 'RootMetadata ' - Me.txtChangedWhen.Location = New System.Drawing.Point(109, 108) - Me.txtChangedWhen.Name = "txtChangedWhen" - Me.txtChangedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White - Me.txtChangedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True - Me.txtChangedWhen.Properties.ReadOnly = True - Me.txtChangedWhen.Size = New System.Drawing.Size(137, 20) - Me.txtChangedWhen.StyleController = Me.LayoutControl1 - Me.txtChangedWhen.TabIndex = 5 + Me.RootMetadata.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.RootMetadata.GroupBordersVisible = False + Me.RootMetadata.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.LayoutControlGroup2, Me.LayoutControlGroup3}) + Me.RootMetadata.Name = "Root" + Me.RootMetadata.Size = New System.Drawing.Size(503, 668) + Me.RootMetadata.TextVisible = False ' - 'txtCreatedWhen + 'LayoutControlGroup1 ' - Me.txtCreatedWhen.Location = New System.Drawing.Point(109, 78) - Me.txtCreatedWhen.Name = "txtCreatedWhen" - Me.txtCreatedWhen.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White - Me.txtCreatedWhen.Properties.AppearanceReadOnly.Options.UseBackColor = True - Me.txtCreatedWhen.Properties.ReadOnly = True - Me.txtCreatedWhen.Size = New System.Drawing.Size(137, 20) - Me.txtCreatedWhen.StyleController = Me.LayoutControl1 - Me.txtCreatedWhen.TabIndex = 4 + Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2}) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 222) + Me.LayoutControlGroup1.Name = "LayoutControlGroup1" + Me.LayoutControlGroup1.Size = New System.Drawing.Size(483, 330) + Me.LayoutControlGroup1.Text = "Objekt Historie" ' - 'txtChangedWho + 'LayoutControlItem2 ' - Me.txtChangedWho.Location = New System.Drawing.Point(338, 108) - Me.txtChangedWho.Name = "txtChangedWho" - Me.txtChangedWho.Properties.AppearanceReadOnly.BackColor = System.Drawing.Color.White - Me.txtChangedWho.Properties.AppearanceReadOnly.Options.UseBackColor = True - Me.txtChangedWho.Properties.ReadOnly = True - Me.txtChangedWho.Size = New System.Drawing.Size(138, 20) - Me.txtChangedWho.StyleController = Me.LayoutControl1 - Me.txtChangedWho.TabIndex = 9 + Me.LayoutControlItem2.Control = Me.GridObjectHistory + Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlItem2.Name = "LayoutControlItem2" + Me.LayoutControlItem2.Size = New System.Drawing.Size(459, 285) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem2.TextVisible = False + ' + 'LayoutControlGroup2 + ' + Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.EmptySpaceItem1, Me.LayoutControlItem1, Me.LayoutControlItem3, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.txtAccessedWho}) + Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) + Me.LayoutControlGroup2.Name = "LayoutControlGroup2" + Me.LayoutControlGroup2.Size = New System.Drawing.Size(483, 222) + Me.LayoutControlGroup2.Text = "Eigenschaften" + ' + 'EmptySpaceItem1 + ' + Me.EmptySpaceItem1.AllowHotTrack = False + Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 120) + Me.EmptySpaceItem1.Name = "EmptySpaceItem1" + Me.EmptySpaceItem1.Size = New System.Drawing.Size(459, 57) + Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'LayoutControlItem1 ' @@ -412,28 +379,60 @@ Partial Class ctrlObjectPropertyDialog Me.txtAccessedWho.Text = "von" Me.txtAccessedWho.TextSize = New System.Drawing.Size(70, 13) ' - 'GridControl2 + 'LayoutControlGroup3 ' - Me.GridControl2.Dock = System.Windows.Forms.DockStyle.Fill - Me.GridControl2.Location = New System.Drawing.Point(0, 0) - Me.GridControl2.MainView = Me.GridView2 - Me.GridControl2.Name = "GridControl2" - Me.GridControl2.Size = New System.Drawing.Size(503, 698) - Me.GridControl2.TabIndex = 0 - Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) + Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.lbLifecycleStart, Me.lbLifecycleEnd}) + Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 552) + Me.LayoutControlGroup3.Name = "LayoutControlGroup3" + Me.LayoutControlGroup3.Size = New System.Drawing.Size(483, 96) + Me.LayoutControlGroup3.Text = "Lebenszyklus" ' - 'GridView2 + 'LayoutControlItem4 ' - Me.GridView2.GridControl = Me.GridControl2 - Me.GridView2.Name = "GridView2" + Me.LayoutControlItem4.Control = Me.progressLifecycle + Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 33) + Me.LayoutControlItem4.Name = "LayoutControlItem4" + Me.LayoutControlItem4.Size = New System.Drawing.Size(459, 18) + Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) + Me.LayoutControlItem4.TextVisible = False + ' + 'lbLifecycleStart + ' + Me.lbLifecycleStart.AllowHotTrack = False + Me.lbLifecycleStart.Location = New System.Drawing.Point(0, 0) + Me.lbLifecycleStart.Name = "lbLifecycleStart" + Me.lbLifecycleStart.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.lbLifecycleStart.Size = New System.Drawing.Size(229, 33) + Me.lbLifecycleStart.Text = "00.00.0000" + Me.lbLifecycleStart.TextSize = New System.Drawing.Size(70, 13) + ' + 'lbLifecycleEnd + ' + Me.lbLifecycleEnd.AllowHotTrack = False + Me.lbLifecycleEnd.AppearanceItemCaption.Options.UseTextOptions = True + Me.lbLifecycleEnd.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far + Me.lbLifecycleEnd.Location = New System.Drawing.Point(229, 0) + Me.lbLifecycleEnd.Name = "lbLifecycleEnd" + Me.lbLifecycleEnd.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) + Me.lbLifecycleEnd.Size = New System.Drawing.Size(230, 33) + Me.lbLifecycleEnd.Text = "99.99.9999" + Me.lbLifecycleEnd.TextSize = New System.Drawing.Size(70, 13) + ' + 'XtraTabPageAttributes + ' + Me.XtraTabPageAttributes.Controls.Add(Me.LayoutControl2) + Me.XtraTabPageAttributes.Name = "XtraTabPageAttributes" + Me.XtraTabPageAttributes.Size = New System.Drawing.Size(503, 668) + Me.XtraTabPageAttributes.Text = "Attribute" ' 'LayoutControl2 ' Me.LayoutControl2.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControl2.Location = New System.Drawing.Point(0, 0) Me.LayoutControl2.Name = "LayoutControl2" + Me.LayoutControl2.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(551, 406, 650, 400) Me.LayoutControl2.Root = Me.Root - Me.LayoutControl2.Size = New System.Drawing.Size(503, 698) + Me.LayoutControl2.Size = New System.Drawing.Size(503, 668) Me.LayoutControl2.TabIndex = 0 Me.LayoutControl2.Text = "LayoutControl2" ' @@ -442,14 +441,113 @@ Partial Class ctrlObjectPropertyDialog Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(503, 698) + Me.Root.Size = New System.Drawing.Size(503, 668) Me.Root.TextVisible = False ' + 'XtraTabPageAttributeHistory + ' + Me.XtraTabPageAttributeHistory.Controls.Add(Me.GridValueHistory) + Me.XtraTabPageAttributeHistory.Name = "XtraTabPageAttributeHistory" + Me.XtraTabPageAttributeHistory.Size = New System.Drawing.Size(503, 668) + Me.XtraTabPageAttributeHistory.Text = "Attribut Historie" + ' + 'GridValueHistory + ' + Me.GridValueHistory.Dock = System.Windows.Forms.DockStyle.Fill + Me.GridValueHistory.Location = New System.Drawing.Point(0, 0) + Me.GridValueHistory.MainView = Me.GridView2 + Me.GridValueHistory.Name = "GridValueHistory" + Me.GridValueHistory.Size = New System.Drawing.Size(503, 668) + Me.GridValueHistory.TabIndex = 0 + Me.GridValueHistory.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2}) + ' + 'GridView2 + ' + Me.GridView2.GridControl = Me.GridValueHistory + Me.GridView2.Name = "GridView2" + ' + 'BarManager1 + ' + Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.d}) + Me.BarManager1.DockControls.Add(Me.barDockControlTop) + Me.BarManager1.DockControls.Add(Me.barDockControlBottom) + Me.BarManager1.DockControls.Add(Me.barDockControlLeft) + Me.BarManager1.DockControls.Add(Me.barDockControlRight) + Me.BarManager1.Form = Me + Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.cmbEntityId, BarStaticItem1}) + Me.BarManager1.MainMenu = Me.d + Me.BarManager1.MaxItemId = 2 + Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.cmbEntityIdInner}) + ' + 'd + ' + Me.d.BarName = "Hauptmenü" + Me.d.DockCol = 0 + Me.d.DockRow = 0 + Me.d.DockStyle = DevExpress.XtraBars.BarDockStyle.Top + Me.d.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(BarStaticItem1), New DevExpress.XtraBars.LinkPersistInfo(Me.cmbEntityId)}) + Me.d.OptionsBar.AllowQuickCustomization = False + Me.d.OptionsBar.DrawDragBorder = False + Me.d.OptionsBar.MinHeight = 30 + Me.d.OptionsBar.UseWholeRow = True + Me.d.Text = "Hauptmenü" + ' + 'cmbEntityId + ' + Me.cmbEntityId.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right + Me.cmbEntityId.CaptionToEditorIndent = 10 + Me.cmbEntityId.Edit = Me.cmbEntityIdInner + Me.cmbEntityId.EditWidth = 100 + Me.cmbEntityId.Id = 0 + Me.cmbEntityId.Name = "cmbEntityId" + ' + 'cmbEntityIdInner + ' + Me.cmbEntityIdInner.AutoHeight = False + Me.cmbEntityIdInner.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.cmbEntityIdInner.Name = "cmbEntityIdInner" + ' + 'barDockControlTop + ' + Me.barDockControlTop.CausesValidation = False + Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top + Me.barDockControlTop.Location = New System.Drawing.Point(0, 0) + Me.barDockControlTop.Manager = Me.BarManager1 + Me.barDockControlTop.Size = New System.Drawing.Size(505, 30) + ' + 'barDockControlBottom + ' + Me.barDockControlBottom.CausesValidation = False + Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom + Me.barDockControlBottom.Location = New System.Drawing.Point(0, 723) + Me.barDockControlBottom.Manager = Me.BarManager1 + Me.barDockControlBottom.Size = New System.Drawing.Size(505, 0) + ' + 'barDockControlLeft + ' + Me.barDockControlLeft.CausesValidation = False + Me.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left + Me.barDockControlLeft.Location = New System.Drawing.Point(0, 30) + Me.barDockControlLeft.Manager = Me.BarManager1 + Me.barDockControlLeft.Size = New System.Drawing.Size(0, 693) + ' + 'barDockControlRight + ' + Me.barDockControlRight.CausesValidation = False + Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right + Me.barDockControlRight.Location = New System.Drawing.Point(505, 30) + Me.barDockControlRight.Manager = Me.BarManager1 + Me.barDockControlRight.Size = New System.Drawing.Size(0, 693) + ' 'ctrlObjectPropertyDialog ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.XtraTabControl1) + Me.Controls.Add(Me.barDockControlLeft) + Me.Controls.Add(Me.barDockControlRight) + Me.Controls.Add(Me.barDockControlBottom) + Me.Controls.Add(Me.barDockControlTop) Me.Name = "ctrlObjectPropertyDialog" Me.Size = New System.Drawing.Size(505, 723) CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() @@ -457,27 +555,21 @@ Partial Class ctrlObjectPropertyDialog Me.XtraTabPageObject.ResumeLayout(False) CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.LayoutControl1.ResumeLayout(False) - CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabPageAttributes.ResumeLayout(False) - Me.XtraTabPageAttributeHistory.ResumeLayout(False) - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridObjectHistory, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.progressLifecycle.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtObjectId.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtCreatedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtCreatedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtChangedWho.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtChangedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.txtAccessedWhen.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TextEdit11.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem5, System.ComponentModel.ISupportInitialize).EndInit() @@ -485,18 +577,27 @@ Partial Class ctrlObjectPropertyDialog CType(Me.LayoutControlItem7, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem8, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.txtAccessedWho, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridControl2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabPageAttributes.ResumeLayout(False) CType(Me.LayoutControl2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() + Me.XtraTabPageAttributeHistory.ResumeLayout(False) + CType(Me.GridValueHistory, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.cmbEntityIdInner, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) + Me.PerformLayout() End Sub Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabPageObject As DevExpress.XtraTab.XtraTabPage Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl - Friend WithEvents ProgressBarControl1 As DevExpress.XtraEditors.ProgressBarControl + Friend WithEvents progressLifecycle As DevExpress.XtraEditors.ProgressBarControl Friend WithEvents RootMetadata As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup @@ -506,7 +607,7 @@ Partial Class ctrlObjectPropertyDialog Friend WithEvents lbLifecycleEnd As DevExpress.XtraLayout.SimpleLabelItem Friend WithEvents XtraTabPageAttributes As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPageAttributeHistory As DevExpress.XtraTab.XtraTabPage - Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridObjectHistory As DevExpress.XtraGrid.GridControl Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents LayoutControlItem2 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem @@ -524,8 +625,16 @@ Partial Class ctrlObjectPropertyDialog Friend WithEvents LayoutControlItem7 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem8 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents txtAccessedWho As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents GridControl2 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridValueHistory As DevExpress.XtraGrid.GridControl Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents LayoutControl2 As DevExpress.XtraLayout.LayoutControl Friend WithEvents Root As DevExpress.XtraLayout.LayoutControlGroup + Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager + Friend WithEvents d As DevExpress.XtraBars.Bar + Friend WithEvents cmbEntityId As DevExpress.XtraBars.BarEditItem + Friend WithEvents cmbEntityIdInner As DevExpress.XtraEditors.Repository.RepositoryItemComboBox + Friend WithEvents barDockControlTop As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlBottom As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlLeft As DevExpress.XtraBars.BarDockControl + Friend WithEvents barDockControlRight As DevExpress.XtraBars.BarDockControl End Class diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.resx b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.resx index 1af7de15..81a00a77 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.resx +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.resx @@ -117,4 +117,10 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + False + + + 17, 17 + \ No newline at end of file diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb index d4e15077..173c5a5d 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb @@ -1,7 +1,190 @@ -Imports DevExpress.XtraTab +Imports System.Windows.Forms +Imports DevExpress.XtraEditors.Repository +Imports DigitalData.GUIs.Common.Base +Imports DigitalData.Modules.EDMI.API +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Language +Imports DigitalData.Modules.ZooFlow Public Class ctrlObjectPropertyDialog - Private Sub ctrlObjectPropertyDialog_Load(sender As Object, e As EventArgs) Handles Me.Load + Implements IBaseForm + Private Property LogConfig As LogConfig Implements IBaseForm.LogConfig + Private Property Logger As Logger Implements IBaseForm.Logger + Private Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler + Private Property ControlManager As AttributeControls + Private Property Client As Client + Private Property Environment As Environment + Private Property ObjectId As Long + + Private ReadOnly Changes As New Dictionary(Of String, Object) + Private Property Loading As Boolean = False + + Public Sub Initialize(pLogConfig As LogConfig, pHostForm As Form, pClient As Client, pEnv As Environment) + LogConfig = pLogConfig + Logger = pLogConfig.GetLogger() + ErrorHandler = New BaseErrorHandler(pLogConfig, pHostForm) + ControlManager = New AttributeControls(pLogConfig, pEnv, pClient) + Client = pClient + Environment = pEnv + End Sub + + Public Async Function LoadObject(pObjectId As Long) As Task(Of Boolean) + ' Load Business Entities + Dim oEntityIds = Await GetBusinessEntitiesForObjectId(pObjectId) + Dim oActiveEntity = oEntityIds.FirstOrDefault() + + Dim oCombobox As RepositoryItemComboBox = DirectCast(cmbEntityId.Edit, RepositoryItemComboBox) + oCombobox.Items.Clear() + oCombobox.Items.AddRange(oEntityIds) + cmbEntityId.EditValue = oEntityIds.First() + + Return Await LoadObject(pObjectId, oActiveEntity) + End Function + + Public Async Function LoadObject(pObjectId As Long, pEntityId As Long) As Task(Of Boolean) + Loading = True + Try + ObjectId = pObjectId + + ' Load History of attribute value changes + Dim oAttributeHistoryTable = Await GetValueHistoryForObjectId(pObjectId) + ShowAttributeHistory(oAttributeHistoryTable) + + ' Load History of object state changes + Dim oObjectHistoryTable = Await GetObjectHistoryForObjectId(pObjectId) + ShowObjectHistory(oObjectHistoryTable) + + ' Load Object Properties + Dim oObjectProperties = Await GetPropertiesForObjectId(ObjectId) + ShowObjectProperties(oObjectProperties) + + ' Load Attribute controls and values + Dim oAttributes = Await ControlManager.GetAttributesForBusinessEntity(cmbEntityId.EditValue) + Await ControlManager.LoadControlsForAttributes(ObjectId, oAttributes, Root) + Catch ex As Exception + Logger.Error(ex) + Finally + Loading = False + End Try + End Function + + Private Function ShowAttributeHistory(pDatatable As DataTable) As Boolean + Try + GridValueHistory.DataSource = pDatatable + + Return True + Catch ex As Exception + Logger.Error(ex) + Return False + End Try + End Function + + Private Function ShowObjectHistory(pDatatable As DataTable) As Boolean + Try + GridObjectHistory.DataSource = pDatatable + + Return True + Catch ex As Exception + Logger.Error(ex) + Return False + End Try + End Function + + Private Function ShowObjectProperties(pDatatable As DataTable) As Boolean + Try + Dim oRow As DataRow = pDatatable.Rows.Item(0) + txtObjectId.Text = oRow.Item("IDB_OBJ_ID") + txtCreatedWhen.Text = oRow.Item("ADDED_WHEN") + txtCreatedWho.Text = oRow.Item("ADDED_WHO") + txtChangedWhen.Text = Utils.NotNull(oRow.Item("CHANGED_WHEN"), String.Empty) + txtChangedWho.Text = Utils.NotNull(oRow.Item("CHANGED_WHO"), String.Empty) + + lbLifecycleStart.Text = DirectCast(oRow.Item("ADDED_WHEN"), Date).ToShortDateString + lbLifecycleEnd.Text = Date.MaxValue.ToShortDateString + progressLifecycle.Position = 30 + + Return True + Catch ex As Exception + Logger.Error(ex) + Return False + End Try + End Function + + Private Async Function GetBusinessEntitiesForObjectId(ObjectId As Long) As Task(Of List(Of Long)) + Try + Dim oSQL = $"SELECT BE_ID FROM TBIDB_OBJECT_BE WHERE IDB_OBJ_ID = {ObjectId}" + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) + + If oResult.OK = False Then + Throw New ApplicationException($"Business Entities could not be retrieved!") + + ElseIf oResult.Table.Rows.Count = 0 Then + Throw New ApplicationException($"ObjectId {ObjectId} is not assigned to any business entity!") + + Else + Dim oEntities As New List(Of Long) + + For Each oRow In oResult.Table.Rows + oEntities.Add(oRow.item("BE_ID")) + Next + + Return oEntities + End If + Catch ex As Exception + Logger.Error(ex) + Return New List(Of Long) + End Try + End Function + + Private Async Function GetValueHistoryForObjectId(ObjectId As Long) As Task(Of DataTable) + Dim oSQL As String = $" + SELECT * FROM VWIDB_CHANGE_LOG + WHERE IDB_OBJ_ID = {ObjectId} AND + ORDER BY ChangeID DESC + " + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) + + Return oResult.Table + End Function + + Private Async Function GetObjectHistoryForObjectId(ObjectId As Long) As Task(Of DataTable) + Dim oSQL As String = $" + SELECT * FROM VWIDB_DOC_STATES + WHERE IDB_OBJ_ID = {ObjectId} AND LANG_CODE = '{Environment.User.Language}' + ORDER BY ADDED_WHEN DESC + " + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) + + Return oResult.Table + End Function + + Private Async Function GetPropertiesForObjectId(ObjectId As Long) As Task(Of DataTable) + Dim oSQL As String = $"SELECT * FROM TBIDB_OBJECT WHERE IDB_OBJ_ID = {ObjectId}" + Dim oResult = Await Client.GetDatatableFromIDBAsync(oSQL) + + Return oResult.Table + End Function + + Private Async Sub Load_Attributes(pObject As Long, pBusinessEntityId As Long) + Try + Dim oAttributes = Await ControlManager.GetAttributesForBusinessEntity(pBusinessEntityId) + + If oAttributes.Count = 0 Then + MsgBox($"Es konnten keine Attribute für das Objekt '{pObject}' geladen werden!", MsgBoxStyle.Critical, Text) + End If + + Await ControlManager.LoadControlsForAttributes(pObject, oAttributes, Root) + Catch ex As Exception + Logger.Error(ex) + End Try + End Sub + + Private Async Sub cmbEntityId_EditValueChanged(sender As Object, e As EventArgs) Handles cmbEntityId.EditValueChanged + Dim oEntityId As Long + + If Integer.TryParse(cmbEntityId.EditValue, oEntityId) AndAlso Loading = False Then + LoadObject(ObjectId, oEntityId) + End If End Sub End Class diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb index e45fe8f8..fab034a3 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb @@ -235,4 +235,8 @@ Public Class frmObjectPropertyDialog ErrorHandler.ShowErrorMessage(ex, "btnSave_ItemClick") End Try End Sub + + Private Sub TabFormControl1_Click(sender As Object, e As EventArgs) Handles TabFormControl1.Click + + End Sub End Class \ No newline at end of file diff --git a/GUIs.Common/frmDocumentResultList.Designer.vb b/GUIs.Common/frmDocumentResultList.Designer.vb index caa3684c..0c015d90 100644 --- a/GUIs.Common/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/frmDocumentResultList.Designer.vb @@ -80,26 +80,9 @@ Partial Class frmDocumentResultList Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.DockPanelMetadata = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() - Me.RootMetadata = New DevExpress.XtraLayout.LayoutControlGroup() Me.DockPanelDocViewer = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() - Me.XtraTabPageAttributes = New DevExpress.XtraTab.XtraTabPage() - Me.XtraTabPageObject = New DevExpress.XtraTab.XtraTabPage() - Me.XtraTabPageAttributeHistory = New DevExpress.XtraTab.XtraTabPage() - Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit() - Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.LayoutControlGroup3 = New DevExpress.XtraLayout.LayoutControlGroup() - Me.ProgressBarControl1 = New DevExpress.XtraEditors.ProgressBarControl() - Me.LayoutControlItem4 = New DevExpress.XtraLayout.LayoutControlItem() - Me.lbLifecycleEnd = New DevExpress.XtraLayout.SimpleLabelItem() - Me.lbLifecycleStart = New DevExpress.XtraLayout.SimpleLabelItem() - Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() - Me.TextEdit3 = New DevExpress.XtraEditors.TextEdit() - Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem() + Me.CtrlObjectPropertyDialog = New DigitalData.GUIs.Common.ctrlObjectPropertyDialog() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -126,26 +109,8 @@ Partial Class frmDocumentResultList Me.DockPanel2_Container.SuspendLayout() Me.DockPanelMetadata.SuspendLayout() Me.DockPanel3_Container.SuspendLayout() - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.LayoutControl1.SuspendLayout() - CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).BeginInit() Me.DockPanelDocViewer.SuspendLayout() Me.DockPanel1_Container.SuspendLayout() - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.XtraTabControl1.SuspendLayout() - Me.XtraTabPageAttributes.SuspendLayout() - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'SplitContainerControl1 @@ -613,29 +578,10 @@ Partial Class frmDocumentResultList ' 'DockPanel3_Container ' - Me.DockPanel3_Container.Controls.Add(Me.XtraTabControl1) + Me.DockPanel3_Container.Controls.Add(Me.CtrlObjectPropertyDialog) resources.ApplyResources(Me.DockPanel3_Container, "DockPanel3_Container") Me.DockPanel3_Container.Name = "DockPanel3_Container" ' - 'LayoutControl1 - ' - Me.LayoutControl1.Controls.Add(Me.TextEdit1) - Me.LayoutControl1.Controls.Add(Me.ProgressBarControl1) - Me.LayoutControl1.Controls.Add(Me.TextEdit3) - resources.ApplyResources(Me.LayoutControl1, "LayoutControl1") - Me.LayoutControl1.Name = "LayoutControl1" - Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1068, 351, 650, 400) - Me.LayoutControl1.Root = Me.RootMetadata - ' - 'RootMetadata - ' - Me.RootMetadata.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.RootMetadata.GroupBordersVisible = False - Me.RootMetadata.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.LayoutControlGroup2, Me.LayoutControlGroup3}) - Me.RootMetadata.Name = "Root" - Me.RootMetadata.Size = New System.Drawing.Size(276, 487) - Me.RootMetadata.TextVisible = False - ' 'DockPanelDocViewer ' Me.DockPanelDocViewer.Controls.Add(Me.DockPanel1_Container) @@ -652,125 +598,10 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanel1_Container, "DockPanel1_Container") Me.DockPanel1_Container.Name = "DockPanel1_Container" ' - 'XtraTabControl1 - ' - resources.ApplyResources(Me.XtraTabControl1, "XtraTabControl1") - Me.XtraTabControl1.Name = "XtraTabControl1" - Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPageAttributes - Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPageAttributes, Me.XtraTabPageObject, Me.XtraTabPageAttributeHistory}) - ' - 'XtraTabPageAttributes - ' - Me.XtraTabPageAttributes.Controls.Add(Me.LayoutControl1) - Me.XtraTabPageAttributes.Name = "XtraTabPageAttributes" - resources.ApplyResources(Me.XtraTabPageAttributes, "XtraTabPageAttributes") - ' - 'XtraTabPageObject - ' - Me.XtraTabPageObject.Name = "XtraTabPageObject" - resources.ApplyResources(Me.XtraTabPageObject, "XtraTabPageObject") - ' - 'XtraTabPageAttributeHistory - ' - Me.XtraTabPageAttributeHistory.Name = "XtraTabPageAttributeHistory" - resources.ApplyResources(Me.XtraTabPageAttributeHistory, "XtraTabPageAttributeHistory") - ' - 'TextEdit1 - ' - resources.ApplyResources(Me.TextEdit1, "TextEdit1") - Me.TextEdit1.MenuManager = Me.RibbonControl - Me.TextEdit1.Name = "TextEdit1" - Me.TextEdit1.StyleController = Me.LayoutControl1 - ' - 'LayoutControlItem1 - ' - Me.LayoutControlItem1.Control = Me.TextEdit1 - Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem1.Name = "LayoutControlItem1" - Me.LayoutControlItem1.Size = New System.Drawing.Size(232, 24) - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(96, 13) - ' - 'LayoutControlGroup1 - ' - Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 69) - Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(256, 69) - ' - 'LayoutControlGroup2 - ' - Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1}) - Me.LayoutControlGroup2.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlGroup2.Name = "LayoutControlGroup2" - Me.LayoutControlGroup2.Size = New System.Drawing.Size(256, 69) - ' - 'LayoutControlGroup3 - ' - Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.lbLifecycleStart, Me.lbLifecycleEnd, Me.EmptySpaceItem1}) - Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 138) - Me.LayoutControlGroup3.Name = "LayoutControlGroup3" - Me.LayoutControlGroup3.Size = New System.Drawing.Size(256, 329) - ' - 'ProgressBarControl1 - ' - resources.ApplyResources(Me.ProgressBarControl1, "ProgressBarControl1") - Me.ProgressBarControl1.MenuManager = Me.RibbonControl - Me.ProgressBarControl1.Name = "ProgressBarControl1" - Me.ProgressBarControl1.StyleController = Me.LayoutControl1 - ' - 'LayoutControlItem4 - ' - Me.LayoutControlItem4.Control = Me.ProgressBarControl1 - Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 262) - Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(232, 22) - Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) - Me.LayoutControlItem4.TextVisible = False - ' - 'lbLifecycleEnd - ' - Me.lbLifecycleEnd.AllowHotTrack = False - Me.lbLifecycleEnd.AppearanceItemCaption.Options.UseTextOptions = True - Me.lbLifecycleEnd.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far - Me.lbLifecycleEnd.Location = New System.Drawing.Point(116, 229) - Me.lbLifecycleEnd.Name = "lbLifecycleEnd" - Me.lbLifecycleEnd.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.lbLifecycleEnd.Size = New System.Drawing.Size(116, 33) - resources.ApplyResources(Me.lbLifecycleEnd, "lbLifecycleEnd") - Me.lbLifecycleEnd.TextSize = New System.Drawing.Size(96, 13) - ' - 'lbLifecycleStart - ' - Me.lbLifecycleStart.AllowHotTrack = False - Me.lbLifecycleStart.Location = New System.Drawing.Point(0, 229) - Me.lbLifecycleStart.Name = "lbLifecycleStart" - Me.lbLifecycleStart.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.lbLifecycleStart.Size = New System.Drawing.Size(116, 33) - resources.ApplyResources(Me.lbLifecycleStart, "lbLifecycleStart") - Me.lbLifecycleStart.TextSize = New System.Drawing.Size(96, 13) - ' - 'EmptySpaceItem1 - ' - Me.EmptySpaceItem1.AllowHotTrack = False - Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 0) - Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(232, 229) - Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) - ' - 'TextEdit3 - ' - resources.ApplyResources(Me.TextEdit3, "TextEdit3") - Me.TextEdit3.MenuManager = Me.RibbonControl - Me.TextEdit3.Name = "TextEdit3" - Me.TextEdit3.StyleController = Me.LayoutControl1 - ' - 'LayoutControlItem3 + 'CtrlObjectPropertyDialog ' - Me.LayoutControlItem3.Control = Me.TextEdit3 - Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0) - Me.LayoutControlItem3.Name = "LayoutControlItem3" - Me.LayoutControlItem3.Size = New System.Drawing.Size(232, 24) - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(96, 13) + resources.ApplyResources(Me.CtrlObjectPropertyDialog, "CtrlObjectPropertyDialog") + Me.CtrlObjectPropertyDialog.Name = "CtrlObjectPropertyDialog" ' 'frmDocumentResultList ' @@ -813,26 +644,8 @@ Partial Class frmDocumentResultList Me.DockPanel2_Container.ResumeLayout(False) Me.DockPanelMetadata.ResumeLayout(False) Me.DockPanel3_Container.ResumeLayout(False) - CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.LayoutControl1.ResumeLayout(False) - CType(Me.RootMetadata, System.ComponentModel.ISupportInitialize).EndInit() Me.DockPanelDocViewer.ResumeLayout(False) Me.DockPanel1_Container.ResumeLayout(False) - CType(Me.XtraTabControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.XtraTabControl1.ResumeLayout(False) - Me.XtraTabPageAttributes.ResumeLayout(False) - CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup3, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.ProgressBarControl1.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem4, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.lbLifecycleEnd, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.lbLifecycleStart, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TextEdit3.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -899,22 +712,5 @@ Partial Class frmDocumentResultList Friend WithEvents DockPanelFileList As DevExpress.XtraBars.Docking.DockPanel Friend WithEvents DockPanel2_Container As DevExpress.XtraBars.Docking.ControlContainer Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl - Friend WithEvents RootMetadata As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl - Friend WithEvents XtraTabPageAttributes As DevExpress.XtraTab.XtraTabPage - Friend WithEvents XtraTabPageObject As DevExpress.XtraTab.XtraTabPage - Friend WithEvents XtraTabPageAttributeHistory As DevExpress.XtraTab.XtraTabPage - Friend WithEvents TextEdit1 As DevExpress.XtraEditors.TextEdit - Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControlItem1 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents ProgressBarControl1 As DevExpress.XtraEditors.ProgressBarControl - Friend WithEvents LayoutControlGroup3 As DevExpress.XtraLayout.LayoutControlGroup - Friend WithEvents LayoutControlItem4 As DevExpress.XtraLayout.LayoutControlItem - Friend WithEvents lbLifecycleStart As DevExpress.XtraLayout.SimpleLabelItem - Friend WithEvents lbLifecycleEnd As DevExpress.XtraLayout.SimpleLabelItem - Friend WithEvents EmptySpaceItem1 As DevExpress.XtraLayout.EmptySpaceItem - Friend WithEvents TextEdit3 As DevExpress.XtraEditors.TextEdit - Friend WithEvents LayoutControlItem3 As DevExpress.XtraLayout.LayoutControlItem + Friend WithEvents CtrlObjectPropertyDialog As ctrlObjectPropertyDialog End Class diff --git a/GUIs.Common/frmDocumentResultList.resx b/GUIs.Common/frmDocumentResultList.resx index 07fe96f2..f7082819 100644 --- a/GUIs.Common/frmDocumentResultList.resx +++ b/GUIs.Common/frmDocumentResultList.resx @@ -793,182 +793,28 @@ 0 - + Fill - - - Bottom - - + 0, 0 - - 132, 45 - - - 120, 20 - - - 4 - - - TextEdit1 - - - DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControl1 - - - 4 - - - 24, 445 - - - 228, 18 - - - 7 - - - ProgressBarControl1 - - - DevExpress.XtraEditors.ProgressBarControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControl1 - - - 5 - - - 132, 114 - - - 120, 20 - - - 8 - - - TextEdit3 - - - DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControl1 - - - 6 - - - Fill - - - 0, 0 - - - 00.00.0000 - - - 99.99.9999 - - - 271, 504 - - - 0 - - - LayoutControl1 - - - LayoutControl1 - - - DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabPageAttributes - - - 0 - - - 271, 504 - - - Attribute - - - XtraTabPageAttributes - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 0 - - + 273, 529 - - 1 - - - 271, 504 - - - XtraTabPage2 - - - XtraTabPageObject - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 1 - - - 271, 504 - - - XtraTabPage3 - - - XtraTabPageAttributeHistory - - - DevExpress.XtraTab.XtraTabPage, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - XtraTabControl1 - - - 2 + + 0 - - XtraTabControl1 + + CtrlObjectPropertyDialog - - DevExpress.XtraTab.XtraTabControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=1.9.1.0, Culture=neutral, PublicKeyToken=null - + DockPanel3_Container - + 0 @@ -1411,66 +1257,6 @@ DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RootMetadata - - - DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControlItem1 - - - DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControlGroup1 - - - DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControlGroup2 - - - DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControlGroup3 - - - DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControlItem4 - - - DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - lbLifecycleEnd - - - DevExpress.XtraLayout.SimpleLabelItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - lbLifecycleStart - - - DevExpress.XtraLayout.SimpleLabelItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - EmptySpaceItem1 - - - DevExpress.XtraLayout.EmptySpaceItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - LayoutControlItem3 - - - DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmDocumentResultList diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index a30f1604..aecbe50a 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -182,6 +182,8 @@ Public Class frmDocumentResultList End If End If + CtrlObjectPropertyDialog.Initialize(LogConfig, Me, _IDBClient, Environment) + SwitchMainContainerHorizontal.Visibility = BarItemVisibility.Never SwitchDetailContainerHorizontal.Visibility = BarItemVisibility.Never End If @@ -271,7 +273,9 @@ Public Class frmDocumentResultList MsgBox($"Es konnten keine Attribute für das Objekt '{oObjectId}' geladen werden!", MsgBoxStyle.Critical, Text) End If - Await ControlManager.LoadControlsForAttributes(oObjectId, oAttributes, RootMetadata) + Await CtrlObjectPropertyDialog.LoadObject(oObjectId) + + 'Await ControlManager.LoadControlsForAttributes(oObjectId, oAttributes, RootMetadata) End If End If Catch ex As Exception diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index c5b1fa0c..8ae86e86 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -204,6 +204,12 @@ Form + + frmObjectProperties.vb + + + Form + Form @@ -274,6 +280,9 @@ frmMsgBox.vb + + frmObjectProperties.vb + frmOld.vb diff --git a/GUIs.Test.TestGUI/frmObjectProperties.Designer.vb b/GUIs.Test.TestGUI/frmObjectProperties.Designer.vb new file mode 100644 index 00000000..9e697171 --- /dev/null +++ b/GUIs.Test.TestGUI/frmObjectProperties.Designer.vb @@ -0,0 +1,48 @@ + _ +Partial Class frmObjectProperties + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.CtrlObjectPropertyDialog1 = New DigitalData.GUIs.Common.ctrlObjectPropertyDialog() + Me.SuspendLayout() + ' + 'CtrlObjectPropertyDialog1 + ' + Me.CtrlObjectPropertyDialog1.Location = New System.Drawing.Point(299, 12) + Me.CtrlObjectPropertyDialog1.Name = "CtrlObjectPropertyDialog1" + Me.CtrlObjectPropertyDialog1.Size = New System.Drawing.Size(505, 723) + Me.CtrlObjectPropertyDialog1.TabIndex = 0 + ' + 'frmObjectProperties + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(816, 809) + Me.Controls.Add(Me.CtrlObjectPropertyDialog1) + Me.Name = "frmObjectProperties" + Me.Text = "frmObjectProperties" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents CtrlObjectPropertyDialog1 As DigitalData.GUIs.Common.ctrlObjectPropertyDialog +End Class diff --git a/GUIs.Test.TestGUI/frmObjectProperties.resx b/GUIs.Test.TestGUI/frmObjectProperties.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/GUIs.Test.TestGUI/frmObjectProperties.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmObjectProperties.vb b/GUIs.Test.TestGUI/frmObjectProperties.vb new file mode 100644 index 00000000..2184dd92 --- /dev/null +++ b/GUIs.Test.TestGUI/frmObjectProperties.vb @@ -0,0 +1,24 @@ +Imports DigitalData.GUIs.Common +Imports DigitalData.GUIs.Common.Base +Imports DigitalData.Modules.Database +Imports DigitalData.Modules.Logging + +Public Class frmObjectProperties + Implements IBaseForm + + Public Sub New(pLogConfig As LogConfig, Database As MSSQLServer) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + LogConfig = pLogConfig + Logger = pLogConfig.GetLogger() + End Sub + + Public ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig + + Public ReadOnly Property Logger As Logger Implements IBaseForm.Logger + + Public ReadOnly Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler + +End Class \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmStart.Designer.vb b/GUIs.Test.TestGUI/frmStart.Designer.vb index 79c7643a..6becaf7f 100644 --- a/GUIs.Test.TestGUI/frmStart.Designer.vb +++ b/GUIs.Test.TestGUI/frmStart.Designer.vb @@ -33,6 +33,7 @@ Partial Class frmStart Me.Button9 = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() Me.Button11 = New System.Windows.Forms.Button() + Me.btnObjectProperties = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'Button1 @@ -134,6 +135,15 @@ Partial Class frmStart Me.Button11.Text = "Fulltext" Me.Button11.UseVisualStyleBackColor = True ' + 'btnObjectProperties + ' + Me.btnObjectProperties.Location = New System.Drawing.Point(254, 326) + Me.btnObjectProperties.Name = "btnObjectProperties" + Me.btnObjectProperties.Size = New System.Drawing.Size(236, 60) + Me.btnObjectProperties.TabIndex = 2 + Me.btnObjectProperties.Text = "Object Properties" + Me.btnObjectProperties.UseVisualStyleBackColor = True + ' 'frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -142,6 +152,7 @@ Partial Class frmStart Me.Controls.Add(Me.Button10) Me.Controls.Add(Me.Button9) Me.Controls.Add(Me.Button6) + Me.Controls.Add(Me.btnObjectProperties) Me.Controls.Add(Me.Button11) Me.Controls.Add(Me.Button5) Me.Controls.Add(Me.Button4) @@ -167,4 +178,5 @@ Partial Class frmStart Friend WithEvents Button9 As Button Friend WithEvents Button10 As Button Friend WithEvents Button11 As Button + Friend WithEvents btnObjectProperties As Button End Class diff --git a/GUIs.Test.TestGUI/frmStart.vb b/GUIs.Test.TestGUI/frmStart.vb index 67d16229..4c10286d 100644 --- a/GUIs.Test.TestGUI/frmStart.vb +++ b/GUIs.Test.TestGUI/frmStart.vb @@ -60,4 +60,9 @@ Public Class frmStart Dim oform As New frmFulltext() oform.Show() End Sub + + Private Sub btnObjectProperties_Click(sender As Object, e As EventArgs) Handles btnObjectProperties.Click + Dim oForm As New frmObjectProperties(LogConfig, Database) + oForm.ShowDialog() + End Sub End Class \ No newline at end of file