diff --git a/EDMI_ClientSuite/Base/BaseClass.vb b/EDMI_ClientSuite/Base/BaseClass.vb index c26058a1..d8c0376a 100644 --- a/EDMI_ClientSuite/Base/BaseClass.vb +++ b/EDMI_ClientSuite/Base/BaseClass.vb @@ -1,5 +1,8 @@ Imports DigitalData.Modules.Logging +''' +''' Base Class which supplies a Logger/LogConfig +''' Public Class BaseClass Protected LogConfig As LogConfig Protected Logger As Logger diff --git a/EDMI_ClientSuite/Base/BaseRibbonForm.vb b/EDMI_ClientSuite/Base/BaseRibbonForm.vb index b130bb3f..8190b869 100644 --- a/EDMI_ClientSuite/Base/BaseRibbonForm.vb +++ b/EDMI_ClientSuite/Base/BaseRibbonForm.vb @@ -44,6 +44,10 @@ Public Class BaseRibbonForm _ErrorHandler.ShowErrorMessage(Exception) End Sub + Public Sub ShowErrorMessage(ErrorMessage As String) + _ErrorHandler.ShowErrorMessage(New Exception(ErrorMessage)) + End Sub + ''' ''' Returns a list of panels that will be show when the form is opened. ''' This can be overridden by all inheriting forms to extend the list of panels diff --git a/EDMI_ClientSuite/ClassControlData.vb b/EDMI_ClientSuite/ClassControlData.vb new file mode 100644 index 00000000..3c410de8 --- /dev/null +++ b/EDMI_ClientSuite/ClassControlData.vb @@ -0,0 +1,35 @@ +Imports DevExpress.XtraEditors +Imports DigitalData.Controls.LookupGrid +Imports DigitalData.Modules.Logging + +Public Class ClassControlData + Inherits BaseClass + + Public Sub New(LogConfig As LogConfig) + MyBase.New(LogConfig) + End Sub + + Public Sub LoadControlData(ByRef Controls As List(Of BaseEdit), Data As DataTable) + Dim oCounter = 0 + + For Each oControl As BaseEdit In Controls + Dim oBindingSource As New BindingSource(Data, Nothing) + + Select Case oControl.GetType + Case GetType(TextEdit) + oControl.DataBindings.Add("Text", oBindingSource, "CTRLVALUE", True, DataSourceUpdateMode.OnPropertyChanged) + Case GetType(MemoEdit) + oControl.DataBindings.Add("Text", oBindingSource, "CTRLVALUE", True, DataSourceUpdateMode.OnPropertyChanged) + Case GetType(DateEdit) + oControl.DataBindings.Add("Text", oBindingSource, "CTRLVALUE", True, DataSourceUpdateMode.OnPropertyChanged) + Case GetType(LookupControl2) + oControl.DataBindings.Add("Text", oBindingSource, "CTRLVALUE", True, DataSourceUpdateMode.OnPropertyChanged) + Case Else + + End Select + + oBindingSource.Position = oCounter + oCounter += 1 + Next + End Sub +End Class diff --git a/EDMI_ClientSuite/ClassControlLoader.vb b/EDMI_ClientSuite/ClassControlLoader.vb index bbb02219..b901ccb8 100644 --- a/EDMI_ClientSuite/ClassControlLoader.vb +++ b/EDMI_ClientSuite/ClassControlLoader.vb @@ -6,28 +6,71 @@ Imports DigitalData.Modules.Logging Public Class ClassControlLoader Inherits BaseClass - Public Sub New(LogConfig As LogConfig) + Private _LayoutControlGroup As LayoutControlGroup + Private _LayoutControls As List(Of BaseEdit) + + Public ReadOnly Property LayoutControls As List(Of BaseEdit) + Get + If _LayoutControls Is Nothing Then + _LayoutControls = New List(Of BaseEdit) + End If + Return _LayoutControls + End Get + End Property + + Public Sub New(LogConfig As LogConfig, LayoutControlGroup As LayoutControlGroup) MyBase.New(LogConfig) + _LayoutControlGroup = LayoutControlGroup + End Sub + + Public Sub AddControl(Name As String, Value As String, LayoutControlGroup As LayoutControlGroup) + Dim oTextEdit As New SimpleLabelItem() With { + .Name = Name, + .Text = Name & " - " & Value + } + + LayoutControlGroup.AddItem(oTextEdit) + End Sub + Public Sub AddControl(Name As String, Value As String) + AddControl(Name, Value, _LayoutControlGroup) + End Sub + + Public Sub AddSeparator(LayoutControlGroup As LayoutControlGroup) + Dim oSeparator = New SimpleSeparator() + + LayoutControlGroup.AddItem(oSeparator) + End Sub + Public Sub AddSeparator() + AddSeparator(_LayoutControlGroup) End Sub Public Sub LoadControls(Datatable As DataTable, LayoutControlGroup As LayoutControlGroup) For Each oRow As DataRow In Datatable.Rows Dim oCaption As String = oRow.Item("COLNAME") Dim oControlType As String = oRow.Item("CTRLTYPE") - Dim oControlId As String = oRow.Item("RECORD_ID").ToString - Dim oEditor As BaseEdit = CreateLayoutControl(oControlType, oControlId) + Dim oControlId As Int64 = oRow.Item("RECORD_ID") + Dim oEditor As BaseEdit = CreateLayoutControl(oControlType, oControlId, oControlId) If oEditor Is Nothing Then Continue For End If + oEditor.Tag = New ClassControlMetadata() With { + .Id = oControlId, + .Type = oControlType + } + + LayoutControls.Add(oEditor) LayoutControlGroup.AddItem(oCaption, oEditor) Next LayoutControlGroup.AddItem(New EmptySpaceItem()) End Sub + Public Sub LoadControls(Datatable As DataTable) + LoadControls(Datatable, _LayoutControlGroup) + End Sub - Public Function CreateLayoutControl(Type As String, Name As String) + Public Function CreateLayoutControl(Type As String, Name As String, Id As Int64) Dim oEditor As BaseEdit = Nothing Logger.Debug("Create new Control of type {0} with name {1}", Type, Name) diff --git a/EDMI_ClientSuite/ClientSuite.vbproj b/EDMI_ClientSuite/ClientSuite.vbproj index 6c6e2082..22654805 100644 --- a/EDMI_ClientSuite/ClientSuite.vbproj +++ b/EDMI_ClientSuite/ClientSuite.vbproj @@ -128,6 +128,7 @@ + @@ -145,6 +146,7 @@ + frmFormDesigner.vb @@ -188,15 +190,9 @@ Form - - - - - - frmStaticListEditor.vb @@ -204,18 +200,6 @@ Form - - ControlSnapPanel.vb - - - Component - - - frmEntityDesigner.vb - - - Form - Form @@ -342,9 +326,6 @@ frmStaticListEditor.vb - - frmEntityDesigner.vb - frmFileTest.vb diff --git a/EDMI_ClientSuite/Common/ClassCommonViews.vb b/EDMI_ClientSuite/Common/ClassCommonViews.vb index 41353080..6e09d655 100644 --- a/EDMI_ClientSuite/Common/ClassCommonViews.vb +++ b/EDMI_ClientSuite/Common/ClassCommonViews.vb @@ -30,4 +30,26 @@ Public Class ClassCommonViews Throw ex End Try End Function + + Public Async Function VWICM_WF_REQUESTCONTROLDATA(FormId As Int64, RequestId As Int64) As Task(Of DataTable) + Try + My.Channel.CreateDatabaseRequest("Load Control Data", True) + + Dim oSQL As String = $"SELECT * FROM VWICM_WF_REQUESTCONTROLDATA WHERE FORMID = {FormId} AND REQUESTID = {RequestId}" + Dim oResult = Await My.Channel.ReturnDatatableAsync(oSQL) + Dim oTable = oResult.Table + + If Not oResult.OK Then + _Logger.Error(New ApplicationException(oResult.ErrorMessage)) + Return Nothing + End If + + My.Channel.CloseDatabaseRequest() + + Return oResult.Table + Catch ex As Exception + _Logger.Error(ex) + Throw ex + End Try + End Function End Class diff --git a/EDMI_ClientSuite/FormEntityDesigner/ClassControlBuilder.vb b/EDMI_ClientSuite/FormEntityDesigner/ClassControlBuilder.vb deleted file mode 100644 index 1998a7d6..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/ClassControlBuilder.vb +++ /dev/null @@ -1,70 +0,0 @@ -Imports DigitalData.Controls.LookupGrid -Imports DigitalData.GUIs.ClientSuite.ClassControlUtils - -Public Class ClassControlBuilder -#Region "State" - Private _DesignMode As Boolean -#End Region - -#Region "Constants" - Private DEFAULT_SIZE As Size = New Size(200, 27) - - Private DEFAULT_TEXT As String = "Unnamed Control" -#End Region - - Public Sub New(DesignMode As Boolean) - _DesignMode = DesignMode - End Sub - - Private Function GetRandomControlName(Name As String) - Return $"{Name}-{ClassUtils.ShortGUID()}" - End Function - - Public Function CreateLabel() As Label - Dim Metadata As New ControlMetadata() With { - .Id = 4711, - .Type = ControlType.Label - } - - Dim oLabel As New Label() With { - .Name = GetRandomControlName("Label"), - .Text = DEFAULT_TEXT, - .AutoSize = False, - .Size = DEFAULT_SIZE, - .Tag = Metadata - } - - Return oLabel - End Function - - Public Function CreateTextbox() As TextBox - Dim Metadata As New ControlMetadata() With { - .Id = 4711, - .Type = ControlType.TextBox - } - - Dim oTextbox As New TextBox() With { - .Name = GetRandomControlName("Textbox"), - .Size = DEFAULT_SIZE, - .Tag = Metadata - } - - Return oTextbox - End Function - - Public Function CreateCombobox() As LookupControl - Dim Metadata As New ControlMetadata() With { - .Id = 4711, - .Type = ControlType.Combobox - } - - Dim oCombobox As New LookupControl() With { - .Name = GetRandomControlName("Combobox"), - .Size = DEFAULT_SIZE, - .Tag = Metadata - } - - Return oCombobox - End Function - -End Class diff --git a/EDMI_ClientSuite/FormEntityDesigner/ClassControlMetadata.vb b/EDMI_ClientSuite/FormEntityDesigner/ClassControlMetadata.vb new file mode 100644 index 00000000..cc1c259d --- /dev/null +++ b/EDMI_ClientSuite/FormEntityDesigner/ClassControlMetadata.vb @@ -0,0 +1,4 @@ +Public Class ClassControlMetadata + Public Id As Int64 + Public Type As String +End Class diff --git a/EDMI_ClientSuite/FormEntityDesigner/ClassControlUtils.vb b/EDMI_ClientSuite/FormEntityDesigner/ClassControlUtils.vb deleted file mode 100644 index 2fd6517f..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/ClassControlUtils.vb +++ /dev/null @@ -1,14 +0,0 @@ -Public Class ClassControlUtils - Public Enum ControlType - Label = 0 - TextBox = 1 - Combobox = 2 - End Enum - - Public Class ControlMetadata - Public Id As Integer - Public Type As ControlType - End Class - - -End Class diff --git a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb index ba7e6905..67a05f68 100644 --- a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb +++ b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassBaseProperties.vb @@ -1,6 +1,5 @@ Imports System.ComponentModel Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization -Imports DigitalData.GUIs.ClientSuite.ClassControlUtils Namespace ControlProperties Public MustInherit Class ClassBaseProperties @@ -10,31 +9,9 @@ Namespace ControlProperties <[ReadOnly](True)> Public Property Id As Integer - - - <[ReadOnly](True)> - Public Property Type As ControlType - Public Property Name As String - - - - Public Property Location As Point - - - - Public Property Size As Size - - - - Public Property Font() As Font - - - - Public Property Color() As Color - End Class End Namespace diff --git a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb deleted file mode 100644 index 8e9f2623..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassInputProperties.vb +++ /dev/null @@ -1,27 +0,0 @@ -Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization - -Namespace ControlProperties - Public MustInherit Class ClassInputProperties - Inherits ClassBaseProperties - - - - Public Property IsRequired() As Boolean - - - - Public Property IsReadOnly() As Boolean - - - - Public Property DefaultValue() As String - - - - Public Property TabIndex() As Integer - - - - Public Property TabStop() As Boolean - End Class -End Namespace diff --git a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb deleted file mode 100644 index 93dafd11..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/BaseClasses/ClassMultiInputProperties.vb +++ /dev/null @@ -1,20 +0,0 @@ -Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization - -Namespace ControlProperties - Public Class ClassMultiInputProperties - Inherits ClassInputProperties - - Private _static_list As String - - - - Public Property StaticList As StaticList - Get - Return New StaticList(_static_list) - End Get - Set(value As StaticList) - _static_list = value?.Value - End Set - End Property - End Class -End Namespace diff --git a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassComboboxProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassComboboxProperties.vb index 996c49cb..b37560c5 100644 --- a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassComboboxProperties.vb +++ b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassComboboxProperties.vb @@ -1,6 +1,14 @@ -Namespace ControlProperties +Imports System.ComponentModel +Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization + +Namespace ControlProperties Public Class ClassComboboxProperties - Inherits ClassMultiInputProperties + Inherits ClassBaseProperties + + + + + Public Property Datasource As String End Class End Namespace diff --git a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb deleted file mode 100644 index ffff5f5f..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassLabelProperties.vb +++ /dev/null @@ -1,14 +0,0 @@ -Imports System.ComponentModel -Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization - -Namespace ControlProperties - Public Class ClassLabelProperties - Inherits ClassBaseProperties - - - - Public Property Caption As String - End Class - -End Namespace - diff --git a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb deleted file mode 100644 index 6a126901..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/ControlProperties/Controls/ClassTextboxProperties.vb +++ /dev/null @@ -1,13 +0,0 @@ -Imports System.ComponentModel -Imports DigitalData.GUIs.ClientSuite.ClassControlLocalization - -Namespace ControlProperties - Public Class ClassTextboxProperties - Inherits ClassInputProperties - - - - - Public Property Multiline() As Boolean - End Class -End Namespace diff --git a/EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.Designer.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.Designer.vb deleted file mode 100644 index 36e9204e..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.Designer.vb +++ /dev/null @@ -1,47 +0,0 @@ -Partial Class ControlSnapPanel - Inherits Panel - - _ - Public Sub New(ByVal container As System.ComponentModel.IContainer) - MyClass.New() - - 'Erforderlich für die Unterstützung des Windows.Forms-Klassenkompositions-Designers - If (container IsNot Nothing) Then - container.Add(Me) - End If - - End Sub - - _ - Public Sub New() - MyBase.New() - - 'Dieser Aufruf ist für den Komponenten-Designer erforderlich. - InitializeComponent() - - End Sub - - 'Die Komponente überschreibt den Löschvorgang zum Bereinigen der Komponentenliste. - _ - 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 Komponenten-Designer benötigt. - Private components As System.ComponentModel.IContainer - - 'Hinweis: Die folgende Prozedur ist für den Komponenten-Designer erforderlich. - 'Das Bearbeiten ist mit dem Komponenten-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ - Private Sub InitializeComponent() - components = New System.ComponentModel.Container() - End Sub - -End Class diff --git a/EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.vb b/EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.vb deleted file mode 100644 index 28807130..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/ControlSnapPanel.vb +++ /dev/null @@ -1,56 +0,0 @@ -Public Class ControlSnapPanel - Inherits Panel - - Private _ShowGrid As Boolean = True - Private _GridSize As Integer = 16 - - Private Property AutoScaleMode As AutoScaleMode - - Public Property GridSize As Integer - Get - Return _GridSize - End Get - Set(value As Integer) - _GridSize = value - Refresh() - End Set - End Property - - Public Property ShowGrid As Boolean - Get - Return _ShowGrid - End Get - Set(value As Boolean) - _ShowGrid = value - Refresh() - End Set - End Property - - Protected Overrides Sub OnControlAdded(e As ControlEventArgs) - AddHandler e.Control.LocationChanged, AddressOf AlignToGrid - AddHandler e.Control.DragDrop, AddressOf AlignToGrid - MyBase.OnControlAdded(e) - End Sub - - Protected Overrides Sub OnControlRemoved(e As ControlEventArgs) - RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid - RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid - MyBase.OnControlRemoved(e) - End Sub - - Protected Overrides Sub OnPaint(e As PaintEventArgs) - If _ShowGrid Then - ControlPaint.DrawGrid(e.Graphics, ClientRectangle, New Size(_GridSize, _GridSize), BackColor) - End If - MyBase.OnPaint(e) - End Sub - - Private Sub AlignToGrid(sender As Object, e As EventArgs) - If _ShowGrid Then - Dim item As Control = CType(sender, Control) - Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize - Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize - item.Location = New Point(x, y) - End If - End Sub -End Class diff --git a/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.Designer.vb b/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.Designer.vb deleted file mode 100644 index fd61135c..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.Designer.vb +++ /dev/null @@ -1,242 +0,0 @@ - -Partial Class frmEntityDesigner - Inherits BaseRibbonForm - - '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.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEntityDesigner)) - Me.PanelMain = New DigitalData.GUIs.ClientSuite.ControlSnapPanel(Me.components) - Me.TabControlMain = New DevExpress.XtraTab.XtraTabControl() - Me.TabPageControls = New DevExpress.XtraTab.XtraTabPage() - Me.Label1 = New System.Windows.Forms.Label() - Me.btnCombobox = New System.Windows.Forms.Button() - Me.btnTextbox = New System.Windows.Forms.Button() - Me.btnLabel = New System.Windows.Forms.Button() - Me.TabPageProperties = New DevExpress.XtraTab.XtraTabPage() - Me.PropertyGridMain = New DevExpress.XtraVerticalGrid.PropertyGridControl() - Me.SplitContainerControlMain = New DevExpress.XtraEditors.SplitContainerControl() - Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.RibbonPageCategory1 = New DevExpress.XtraBars.Ribbon.RibbonPageCategory() - Me.RibbonPage3 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - CType(Me.TabControlMain, System.ComponentModel.ISupportInitialize).BeginInit() - Me.TabControlMain.SuspendLayout() - Me.TabPageControls.SuspendLayout() - Me.TabPageProperties.SuspendLayout() - CType(Me.PropertyGridMain, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.SplitContainerControlMain, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainerControlMain.SuspendLayout() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SuspendLayout() - ' - 'PanelMain - ' - Me.PanelMain.AllowDrop = True - Me.PanelMain.Dock = System.Windows.Forms.DockStyle.Fill - Me.PanelMain.GridSize = 8 - Me.PanelMain.Location = New System.Drawing.Point(0, 0) - Me.PanelMain.Name = "PanelMain" - Me.PanelMain.ShowGrid = True - Me.PanelMain.Size = New System.Drawing.Size(808, 458) - Me.PanelMain.TabIndex = 0 - ' - 'TabControlMain - ' - Me.TabControlMain.Dock = System.Windows.Forms.DockStyle.Fill - Me.TabControlMain.Location = New System.Drawing.Point(0, 0) - Me.TabControlMain.Name = "TabControlMain" - Me.TabControlMain.SelectedTabPage = Me.TabPageControls - Me.TabControlMain.Size = New System.Drawing.Size(224, 458) - Me.TabControlMain.TabIndex = 0 - Me.TabControlMain.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.TabPageControls, Me.TabPageProperties}) - ' - 'TabPageControls - ' - Me.TabPageControls.Controls.Add(Me.Label1) - Me.TabPageControls.Controls.Add(Me.btnCombobox) - Me.TabPageControls.Controls.Add(Me.btnTextbox) - Me.TabPageControls.Controls.Add(Me.btnLabel) - Me.TabPageControls.Name = "TabPageControls" - Me.TabPageControls.Size = New System.Drawing.Size(222, 433) - Me.TabPageControls.Text = "Controls" - ' - 'Label1 - ' - Me.Label1.Dock = System.Windows.Forms.DockStyle.Top - Me.Label1.Location = New System.Drawing.Point(0, 0) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(222, 31) - Me.Label1.TabIndex = 2 - Me.Label1.Text = "Ziehen Sie zum Erstellen einen Controll-Button auf das Panel" - ' - 'btnCombobox - ' - Me.btnCombobox.Location = New System.Drawing.Point(3, 92) - Me.btnCombobox.Name = "btnCombobox" - Me.btnCombobox.Size = New System.Drawing.Size(216, 23) - Me.btnCombobox.TabIndex = 1 - Me.btnCombobox.Text = "Combobox" - Me.btnCombobox.UseVisualStyleBackColor = True - ' - 'btnTextbox - ' - Me.btnTextbox.Location = New System.Drawing.Point(3, 63) - Me.btnTextbox.Name = "btnTextbox" - Me.btnTextbox.Size = New System.Drawing.Size(216, 23) - Me.btnTextbox.TabIndex = 1 - Me.btnTextbox.Text = "Textbox" - Me.btnTextbox.UseVisualStyleBackColor = True - ' - 'btnLabel - ' - Me.btnLabel.Location = New System.Drawing.Point(3, 34) - Me.btnLabel.Name = "btnLabel" - Me.btnLabel.Size = New System.Drawing.Size(216, 23) - Me.btnLabel.TabIndex = 0 - Me.btnLabel.Text = "Label" - Me.btnLabel.UseVisualStyleBackColor = True - ' - 'TabPageProperties - ' - Me.TabPageProperties.Controls.Add(Me.PropertyGridMain) - Me.TabPageProperties.Name = "TabPageProperties" - Me.TabPageProperties.Size = New System.Drawing.Size(222, 258) - Me.TabPageProperties.Text = "Properties" - ' - 'PropertyGridMain - ' - Me.PropertyGridMain.Dock = System.Windows.Forms.DockStyle.Fill - Me.PropertyGridMain.Location = New System.Drawing.Point(0, 0) - Me.PropertyGridMain.Name = "PropertyGridMain" - Me.PropertyGridMain.Size = New System.Drawing.Size(222, 258) - Me.PropertyGridMain.TabIndex = 0 - ' - 'SplitContainerControlMain - ' - Me.SplitContainerControlMain.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainerControlMain.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2 - Me.SplitContainerControlMain.Location = New System.Drawing.Point(0, 146) - Me.SplitContainerControlMain.Name = "SplitContainerControlMain" - Me.SplitContainerControlMain.Panel1.Controls.Add(Me.PanelMain) - Me.SplitContainerControlMain.Panel1.Text = "Panel1" - Me.SplitContainerControlMain.Panel2.Controls.Add(Me.TabControlMain) - Me.SplitContainerControlMain.Panel2.Text = "Panel2" - Me.SplitContainerControlMain.Size = New System.Drawing.Size(1044, 458) - Me.SplitContainerControlMain.SplitterPosition = 224 - Me.SplitContainerControlMain.TabIndex = 1 - Me.SplitContainerControlMain.Text = "SplitContainerControl1" - ' - 'RibbonControl1 - ' - Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.BarButtonItem1}) - Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 2 - Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.PageCategories.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageCategory() {Me.RibbonPageCategory1}) - Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(1044, 146) - Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 - ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "Control Löschen" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.Image = CType(resources.GetObject("BarButtonItem1.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonItem1.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'RibbonPageCategory1 - ' - Me.RibbonPageCategory1.Name = "RibbonPageCategory1" - Me.RibbonPageCategory1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage3}) - Me.RibbonPageCategory1.Text = "Entitäten Designer" - ' - 'RibbonPage3 - ' - Me.RibbonPage3.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3}) - Me.RibbonPage3.Name = "RibbonPage3" - Me.RibbonPage3.Text = "Aktionen" - ' - 'RibbonPageGroup3 - ' - Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - Me.RibbonPageGroup3.Text = "Aktionen" - ' - 'RibbonStatusBar1 - ' - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 604) - Me.RibbonStatusBar1.Name = "RibbonStatusBar1" - Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1044, 21) - ' - 'RibbonPage2 - ' - Me.RibbonPage2.Name = "RibbonPage2" - Me.RibbonPage2.Text = "RibbonPage2" - ' - 'frmEntityDesigner - ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1044, 625) - Me.Controls.Add(Me.SplitContainerControlMain) - Me.Controls.Add(Me.RibbonStatusBar1) - Me.Controls.Add(Me.RibbonControl1) - Me.Name = "frmEntityDesigner" - Me.Ribbon = Me.RibbonControl1 - Me.StatusBar = Me.RibbonStatusBar1 - Me.Text = "Entitäten Designer" - CType(Me.TabControlMain, System.ComponentModel.ISupportInitialize).EndInit() - Me.TabControlMain.ResumeLayout(False) - Me.TabPageControls.ResumeLayout(False) - Me.TabPageProperties.ResumeLayout(False) - CType(Me.PropertyGridMain, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.SplitContainerControlMain, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainerControlMain.ResumeLayout(False) - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() - Me.ResumeLayout(False) - Me.PerformLayout() - - End Sub - Friend WithEvents TabControlMain As DevExpress.XtraTab.XtraTabControl - Friend WithEvents TabPageProperties As DevExpress.XtraTab.XtraTabPage - Friend WithEvents PropertyGridMain As DevExpress.XtraVerticalGrid.PropertyGridControl - Friend WithEvents TabPageControls As DevExpress.XtraTab.XtraTabPage - Friend WithEvents PanelMain As ControlSnapPanel - Friend WithEvents btnTextbox As Button - Friend WithEvents btnLabel As Button - Friend WithEvents SplitContainerControlMain As DevExpress.XtraEditors.SplitContainerControl - Friend WithEvents btnCombobox As Button - Friend WithEvents Label1 As Label - Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar - Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageCategory1 As DevExpress.XtraBars.Ribbon.RibbonPageCategory - Friend WithEvents RibbonPage3 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem -End Class diff --git a/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.resx b/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.resx deleted file mode 100644 index 89f848de..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.resx +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAENhbmNlbDtTdG9wO0V4aXQ7QmFy - cztSaWJib247TJaWsgAAAMJJREFUOE+Nk0sKAjEQRHM4YVZ6CS8gfhBGHK/pSRRXbRWkJOlOq4sHSf0Y - BlLMrNy3qzWYef4HZC/s8KzyCxi4+rAHmVvNsrOhcKqCSEfgqSz2Ms7OCCPQfPlIvQ2kIzgPy+QzUIN+ - ZAFpmXQDBAE/0tKVSXcRCI5GQpkEgSDsP5sso2wQEByVRRjpLgj48gGEH9t2vpYbLx35WRbQhiM0+DBa - I5QFPD8yU5zAowppWSCjkSeYJHJk58MZyPIBTmZW3tJAnMwmSptiAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAjdEVYdFRpdGxlAENhbmNlbDtTdG9wO0V4aXQ7QmFy - cztSaWJib247TJaWsgAAAW5JREFUWEfFlk1KBDEUhGfmAg56JTcuHEGP4FFFFMVZz1VcxaomD57pek1e - hLj4FilSP9Dd0LtSyr8ixZlIcSZSnIkUL8+3f6LJOvhzixRr0BV4AXf13I3LuQev4OjzPVKEgeUfoIBv - kBpRM1hOLzM+gRyxEnDxALiaRiM7wpcbzNy3fb8OBi4+gTagd4Qq5/lBda0EgsvksRrboK0RqXIiRRiM - zIh0OZEiTJ6eEUPlRIowtmyNGC4nUoRZEY0YLidSRECEGuFJlRMpImSLaMRSDmRmhBQZsoF65jZgeTFV - ZoQUGRIQlRvLCJUZIUWEKKK3XWndI6SIgN5yPvPwE1XZLVKEubfc7gyPkCKMmXJjaIQUYSJR+Qn4Yk96 - hBRhGCk3UiNWAi7uwVs1+oCeckONeAfdPyTX4Ksas+WW4UecwU3bQ1YCwWXCEVydKicuhyOYIcuJFC0I - 8P/Qn7tosvK/5TOR4kykOBMpzqPsfgBphQ1j4i+mWAAAAABJRU5ErkJggg== - - - \ No newline at end of file diff --git a/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.vb b/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.vb deleted file mode 100644 index 01632f45..00000000 --- a/EDMI_ClientSuite/FormEntityDesigner/frmEntityDesigner.vb +++ /dev/null @@ -1,258 +0,0 @@ -Imports System.ComponentModel -Imports DevExpress.XtraEditors.Repository -Imports DevExpress.XtraVerticalGrid -Imports DigitalData.GUIs.ClientSuite.ClassControlUtils -Imports DigitalData.GUIs.ClientSuite.ControlProperties - -Public Class frmEntityDesigner - Private _IsMouseDown As Boolean = False - Private _IsMouseMoving As Boolean = False - - Private _BeginPosition As Point = Nothing - Private _EndPosition As Point = Nothing - Private _LastCursorPosition As Point = Nothing - - Private _CurrentControl As Control = Nothing - Private _ControlBuilder As ClassControlBuilder = Nothing - - Private _DragDropButtonList As New List(Of Button) - - Private Sub frmEntityDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load - ' Assign Control Types to DragDrop Buttons - btnLabel.Tag = ControlType.Label - btnTextbox.Tag = ControlType.TextBox - btnCombobox.Tag = ControlType.Combobox - - ' Add Default Editors for certain datatypes in the PropertyGrid - Dim oColorEditor = New RepositoryItemColorEdit() - Dim oBooleanEditor = New RepositoryItemCheckEdit() - - PropertyGridMain.DefaultEditors.Add(GetType(Color), oColorEditor) - PropertyGridMain.DefaultEditors.Add(GetType(Boolean), oBooleanEditor) - - ' Create the control builder - _ControlBuilder = New ClassControlBuilder(DesignMode:=True) - - ' Create a list of all DragDrop buttons - _DragDropButtonList.Add(btnLabel) - _DragDropButtonList.Add(btnTextbox) - _DragDropButtonList.Add(btnCombobox) - - ' Add EventHandlers for each button - For Each oButton As Button In _DragDropButtonList - AddHandler oButton.MouseDown, AddressOf DragDropButton_MouseDown - AddHandler oButton.MouseMove, AddressOf DragDropButton_MouseMove - Next - End Sub - -#Region "Control Buttons Events" - Private Sub DragDropButton_MouseDown(sender As Object, e As MouseEventArgs) - _IsMouseDown = True - End Sub - - Private Sub DragDropButton_MouseMove(sender As Button, e As MouseEventArgs) - If _IsMouseDown Then - Dim oButton = sender - Dim oType As ControlType = oButton.Tag - - oButton.DoDragDrop(oType.ToString, DragDropEffects.Copy) - End If - End Sub - - Private Sub SnapPanelMain_DragEnter(sender As Object, e As DragEventArgs) Handles PanelMain.DragEnter - If (e.Data.GetDataPresent(DataFormats.Text)) Then - e.Effect = DragDropEffects.Copy - Else - e.Effect = DragDropEffects.None - End If - End Sub - - Private Sub SnapPanelMain_DragDrop(sender As Object, e As DragEventArgs) Handles PanelMain.DragDrop - Dim data As String = e.Data.GetData(DataFormats.Text) - Dim type = ClassUtils.ToEnum(Of ClassControlUtils.ControlType)(data) - - HandleDragDrop(type) - End Sub -#End Region - -#Region "Control Events" - Private Sub Control_MouseDown(sender As Control, e As MouseEventArgs) - If e.Button = MouseButtons.Left Then - _CurrentControl = sender - _BeginPosition = e.Location - - ' Set the mode flag to signal the MouseMove event handler that it - ' needs to now calculate new positions for our control - _IsMouseMoving = True - End If - End Sub - - Private Sub Control_MouseMove(sender As Object, e As MouseEventArgs) - If _CurrentControl Is Nothing Or Not _IsMouseMoving Then - Exit Sub - End If - - Cursor = Cursors.Hand - - Dim oCursorPosition As Point = PanelMain.PointToClient(Cursor.Position) - Dim oNewPosition As New Point(oCursorPosition.X - _BeginPosition.X, oCursorPosition.Y - _BeginPosition.Y) - - ' If control will be moved out the of bounds of the panel at TOP/LEFT side, exit. - If oNewPosition.X < 0 Or oNewPosition.Y < 0 Then - Exit Sub - End If - - _CurrentControl.Location = oNewPosition - End Sub - - Private Sub Control_MouseUp(sender As Object, e As MouseEventArgs) - If Not _IsMouseMoving Then - Exit Sub - End If - - _IsMouseMoving = False - _EndPosition = e.Location - - Cursor = Cursors.Default - End Sub - - Private Sub Control_MouseClick(sender As Control, e As MouseEventArgs) - TabControlMain.SelectedTabPage = TabPageProperties - HandleLoadProperties(sender) - End Sub - - Private Sub Control_MouseEnter(sender As Control, e As EventArgs) - Cursor = Cursors.Hand - End Sub - - Private Sub Control_MouseLeave(sender As Control, e As EventArgs) - Cursor = Cursors.Default - End Sub - - Private Sub SetEventHandlers(Control As Control) - AddHandler Control.MouseDown, AddressOf Control_MouseDown - AddHandler Control.MouseMove, AddressOf Control_MouseMove - AddHandler Control.MouseUp, AddressOf Control_MouseUp - AddHandler Control.MouseClick, AddressOf Control_MouseClick - AddHandler Control.MouseEnter, AddressOf Control_MouseEnter - AddHandler Control.MouseLeave, AddressOf Control_MouseLeave - End Sub -#End Region - - Private Sub HandleLoadProperties(Control As Control) - Dim oMetadata As ControlMetadata = Control.Tag - Dim oType = oMetadata.Type - Dim oProps As ClassBaseProperties = Nothing - - Select Case oType - Case ControlType.Label - oProps = New ClassLabelProperties With { - .Id = oMetadata.Id, - .Name = Control.Name, - .Type = oType, - .Location = Control.Location, - .Size = Control.Size, - .Font = Control.Font, - .Color = Control.ForeColor, - .Caption = Control.Text - } - Case ControlType.TextBox - oProps = New ClassTextboxProperties With { - .Id = oMetadata.Id, - .Name = Control.Name, - .Type = oType, - .Location = Control.Location, - .Size = Control.Size, - .Font = Control.Font, - .Color = ForeColor, - .IsReadOnly = False, - .IsRequired = False, - .Multiline = False, - .TabIndex = 0, - .TabStop = 1, - .DefaultValue = "" - } - Case ControlType.Combobox - oProps = New ClassComboboxProperties() With { - .Id = oMetadata.Id, - .Name = Control.Name, - .Type = oType, - .Location = Control.Location, - .Size = Control.Size, - .Font = Control.Font, - .Color = ForeColor, - .IsReadOnly = False, - .IsRequired = False, - .TabIndex = 0, - .TabStop = 1, - .DefaultValue = "", - .StaticList = New StaticList() - } - Case Else - Exit Sub - End Select - - PropertyGridMain.SelectedObject = oProps - End Sub - - Private Sub HandleDragDrop(type As ControlType) - Dim oCursorPosition As Point = PanelMain.PointToClient(Cursor.Position) - Dim oControl As Control = Nothing - - Select Case type - Case ControlType.Label - oControl = _ControlBuilder.CreateLabel() - Case ControlType.TextBox - oControl = _ControlBuilder.CreateTextbox() - Case ControlType.Combobox - oControl = _ControlBuilder.CreateCombobox() - Case Else - MsgBox($"Unknown Control Type {type.ToString}") - Exit Sub - End Select - - ' Set Location to current cursor position - oControl.Location = oCursorPosition - - ' Attach Eventhandlers - SetEventHandlers(oControl) - - ' Add the control to the panel - PanelMain.Controls.Add(oControl) - End Sub - - Private Sub PropertyGridMain_RowChanged(sender As Object, e As DevExpress.XtraVerticalGrid.Events.RowChangedEventArgs) Handles PropertyGridMain.RowChanged - If e.ChangeType <> RowChangeTypeEnum.Value Then - Exit Sub - End If - - Dim oPropertyName As String = e.Properties.FieldName - Dim oPropertyValue = e.Properties.Value - - - Select Case oPropertyName - Case "Name" - _CurrentControl.Name = oPropertyValue - Case "Location" - _CurrentControl.Location = oPropertyValue - Case "X" - _CurrentControl.Location = New Point(oPropertyValue, _CurrentControl.Location.Y) - Case "Y" - _CurrentControl.Location = New Point(_CurrentControl.Location.X, oPropertyValue) - Case "Size" - _CurrentControl.Size = oPropertyValue - Case "Width" - _CurrentControl.Size = New Size(oPropertyValue, _CurrentControl.Height) - Case "Height" - _CurrentControl.Size = New Size(_CurrentControl.Width, oPropertyValue) - Case "Font" - _CurrentControl.Font = oPropertyValue - Case "Color" - _CurrentControl.ForeColor = oPropertyValue - Case "Caption" - If TypeOf _CurrentControl Is Label Then - _CurrentControl.Text = oPropertyValue - End If - End Select - End Sub -End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.Designer.vb b/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.Designer.vb index 759e552e..c12e93f3 100644 --- a/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.Designer.vb +++ b/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.Designer.vb @@ -36,7 +36,7 @@ Partial Class frmFormDesigner Me.XtraTabControl1 = New DevExpress.XtraTab.XtraTabControl() Me.XtraTabPageControls = New DevExpress.XtraTab.XtraTabPage() Me.XtraTabPageProperties = New DevExpress.XtraTab.XtraTabPage() - Me.PropertyGridControl1 = New DevExpress.XtraVerticalGrid.PropertyGridControl() + Me.PropertyGridControlMain = New DevExpress.XtraVerticalGrid.PropertyGridControl() Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlMain, System.ComponentModel.ISupportInitialize).BeginInit() @@ -45,7 +45,7 @@ Partial Class frmFormDesigner Me.XtraTabControl1.SuspendLayout() Me.XtraTabPageControls.SuspendLayout() Me.XtraTabPageProperties.SuspendLayout() - CType(Me.PropertyGridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PropertyGridControlMain, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerMain.SuspendLayout() Me.SuspendLayout() @@ -188,18 +188,18 @@ Partial Class frmFormDesigner ' 'XtraTabPageProperties ' - Me.XtraTabPageProperties.Controls.Add(Me.PropertyGridControl1) + Me.XtraTabPageProperties.Controls.Add(Me.PropertyGridControlMain) Me.XtraTabPageProperties.Name = "XtraTabPageProperties" Me.XtraTabPageProperties.Size = New System.Drawing.Size(232, 337) Me.XtraTabPageProperties.Text = "Eigenschaften" ' 'PropertyGridControl1 ' - Me.PropertyGridControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.PropertyGridControl1.Location = New System.Drawing.Point(0, 0) - Me.PropertyGridControl1.Name = "PropertyGridControl1" - Me.PropertyGridControl1.Size = New System.Drawing.Size(232, 337) - Me.PropertyGridControl1.TabIndex = 0 + Me.PropertyGridControlMain.Dock = System.Windows.Forms.DockStyle.Fill + Me.PropertyGridControlMain.Location = New System.Drawing.Point(0, 0) + Me.PropertyGridControlMain.Name = "PropertyGridControl1" + Me.PropertyGridControlMain.Size = New System.Drawing.Size(232, 337) + Me.PropertyGridControlMain.TabIndex = 0 ' 'SplitContainerMain ' @@ -235,7 +235,7 @@ Partial Class frmFormDesigner Me.XtraTabControl1.ResumeLayout(False) Me.XtraTabPageControls.ResumeLayout(False) Me.XtraTabPageProperties.ResumeLayout(False) - CType(Me.PropertyGridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PropertyGridControlMain, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerMain, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerMain.ResumeLayout(False) Me.ResumeLayout(False) @@ -257,7 +257,7 @@ Partial Class frmFormDesigner Friend WithEvents XtraTabControl1 As DevExpress.XtraTab.XtraTabControl Friend WithEvents XtraTabPageControls As DevExpress.XtraTab.XtraTabPage Friend WithEvents XtraTabPageProperties As DevExpress.XtraTab.XtraTabPage - Friend WithEvents PropertyGridControl1 As DevExpress.XtraVerticalGrid.PropertyGridControl + Friend WithEvents PropertyGridControlMain As DevExpress.XtraVerticalGrid.PropertyGridControl Friend WithEvents SplitContainerMain As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents ToolboxItemCombobox As DevExpress.XtraToolbox.ToolboxItem Friend WithEvents ToolboxItemCheckbox As DevExpress.XtraToolbox.ToolboxItem diff --git a/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.vb b/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.vb index 833a63ac..90a0e7ed 100644 --- a/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.vb +++ b/EDMI_ClientSuite/FormEntityDesigner/frmFormDesigner.vb @@ -5,6 +5,7 @@ Imports DevExpress.XtraLayout.Customization Imports DevExpress.XtraLayout.Dragging Imports DevExpress.XtraLayout.HitInfo Imports DigitalData.Controls.LookupGrid +Imports DigitalData.GUIs.ClientSuite.ControlProperties Public Class frmFormDesigner Private _FormId As Int64 @@ -45,7 +46,7 @@ Public Class frmFormDesigner Dim oHitInfo As BaseLayoutItemHitInfo = LayoutControlMain.CalcHitInfo(oPosition) Dim oLayoutControl As LayoutControlItem = DirectCast(_DragItem, LayoutControlItem) Dim oControlName As String = oLayoutControl.Tag & ClassUtils.ShortGUID() - Dim oControl As Control = _ControlLoader.CreateLayoutControl(oLayoutControl.Tag, oControlName) + Dim oControl As Control = _ControlLoader.CreateLayoutControl(oLayoutControl.Tag, oControlName, 0) If oLayoutControl IsNot Nothing Then HideDragHelper() @@ -104,11 +105,11 @@ Public Class frmFormDesigner End Sub Private Async Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles MyBase.Load - _ControlLoader = New ClassControlLoader(My.LogConfig) + _ControlLoader = New ClassControlLoader(My.LogConfig, LayoutControlGroupMain) Dim oTable = Await My.Common.Views.VWICM_FORM_CONTROL(_FormId) - _ControlLoader.LoadControls(oTable, LayoutControlGroupMain) + _ControlLoader.LoadControls(oTable) End Sub Private Function CreateLayoutControlItem(Id As String) As LayoutControlItem @@ -117,5 +118,22 @@ Public Class frmFormDesigner Private Sub LayoutControlMain_ItemSelectionChanged(sender As Object, e As EventArgs) Handles LayoutControlMain.ItemSelectionChanged ' TODO: Load Property Grid for selected item + Dim oLayoutItem As LayoutControlItem = DirectCast(sender, LayoutControlItem) + Dim oSelectedControl As BaseEdit = oLayoutItem.Control + Dim oMetadata As ClassControlMetadata = oSelectedControl.Tag + + Select Case oSelectedControl.GetType + Case GetType(MemoEdit) + + Case GetType(TextEdit) + + Case GetType(LookupControl2) + PropertyGridControlMain.SelectedObject = New ClassComboboxProperties() With { + .Datasource = "TEST", + .Id = oMetadata.Id + } + End Select + + End Sub End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb index a81230a0..63af073b 100644 --- a/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb +++ b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class frmWorkflowStep - Inherits DevExpress.XtraBars.Ribbon.RibbonForm + Inherits BaseRibbonForm 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) If disposing AndAlso components IsNot Nothing Then components.Dispose() @@ -17,7 +17,7 @@ Partial Class frmWorkflowStep 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() @@ -25,10 +25,10 @@ Partial Class frmWorkflowStep Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() - Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup() + Me.LayoutControlGroupMain = New DevExpress.XtraLayout.LayoutControlGroup() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LayoutControlGroupMain, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'RibbonControl @@ -65,18 +65,19 @@ Partial Class frmWorkflowStep Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill Me.LayoutControl1.Location = New System.Drawing.Point(0, 146) Me.LayoutControl1.Name = "LayoutControl1" - Me.LayoutControl1.Root = Me.LayoutControlGroup1 + Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(1039, 241, 650, 400) + Me.LayoutControl1.Root = Me.LayoutControlGroupMain Me.LayoutControl1.Size = New System.Drawing.Size(991, 348) Me.LayoutControl1.TabIndex = 2 Me.LayoutControl1.Text = "LayoutControl1" ' - 'LayoutControlGroup1 + 'LayoutControlGroupMain ' - Me.LayoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] - Me.LayoutControlGroup1.GroupBordersVisible = False - Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(991, 348) - Me.LayoutControlGroup1.TextVisible = False + Me.LayoutControlGroupMain.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] + Me.LayoutControlGroupMain.GroupBordersVisible = False + Me.LayoutControlGroupMain.Name = "Root" + Me.LayoutControlGroupMain.Size = New System.Drawing.Size(991, 348) + Me.LayoutControlGroupMain.TextVisible = False ' 'frmWorkflowStep ' @@ -92,7 +93,7 @@ Partial Class frmWorkflowStep Me.Text = "frmWorkflowStep" CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.LayoutControlGroupMain, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -103,6 +104,5 @@ Partial Class frmWorkflowStep Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents LayoutControl1 As DevExpress.XtraLayout.LayoutControl - Friend WithEvents LayoutControlGroup1 As DevExpress.XtraLayout.LayoutControlGroup - + Friend WithEvents LayoutControlGroupMain As DevExpress.XtraLayout.LayoutControlGroup End Class diff --git a/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.vb b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.vb index 16ec780b..cc153587 100644 --- a/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.vb +++ b/EDMI_ClientSuite/FormWorkflow/frmWorkflowStep.vb @@ -1,3 +1,66 @@ -Public Class frmWorkflowStep +Imports DevExpress.XtraLayout +Imports DigitalData.GUIs.ClientSuite +Public Class frmWorkflowStep + Private _ControlLoader As ClassControlLoader + Private _ControlData As ClassControlData + + Private _FormId As Int64 + Private _RequestId As Int64 + Private _ProcessName As String + Private _RequestName As String + + Private _HeaderGroup As LayoutControlGroup + Private _BodyGroup As LayoutControlGroup + + Public Sub New(RequestId As Int64) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + _RequestId = RequestId + End Sub + + Private Async Function GetRequestData(RequestId) As Task + Await My.Channel.CreateDatabaseRequestAsync("Get Request Data", True) + + Dim oResult = Await My.Channel.ReturnDatatableAsync($"SELECT PROCESS_NAME, TITLE, FORM_ID FROM VWICM_WF_REQUEST WHERE RECORD_ID = {RequestId}") + + If Not oResult.OK Then + Throw New ApplicationException("Request data could not be fetched!") + ShowErrorMessage(oResult.ErrorMessage) + End If + + My.Channel.CloseDatabaseRequest() + + Dim oRows = oResult.Table.Rows + + If oRows.Count = 1 Then + _FormId = oRows.Item(0).Item("FORM_ID") + _ProcessName = oRows.Item(0).Item("PROCESS_NAME") + _RequestName = oRows.Item(0).Item("TITLE") + Else + Throw New ApplicationException("Request data could not be fetched!") + End If + End Function + + + Private Async Sub frmWorkflowStep_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Await GetRequestData(_RequestId) + + Dim oControlTable = Await My.Common.Views.VWICM_FORM_CONTROL(_FormId) + Dim oControlData = Await My.Common.Views.VWICM_WF_REQUESTCONTROLDATA(_FormId, _RequestId) + + _HeaderGroup = LayoutControlGroupMain.AddGroup("Request Header") + _BodyGroup = LayoutControlGroupMain.AddGroup("Control Body") + + _ControlLoader = New ClassControlLoader(My.LogConfig, _BodyGroup) + _ControlData = New ClassControlData(My.LogConfig) + + _ControlLoader.LoadControls(oControlTable) + _ControlData.LoadControlData(_ControlLoader.LayoutControls, oControlData) + + _ControlLoader.AddControl("Process Name", _ProcessName, _HeaderGroup) + _ControlLoader.AddControl("Request Name", _RequestName, _HeaderGroup) + End Sub End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmMain.Designer.vb b/EDMI_ClientSuite/frmMain.Designer.vb index 087703f7..2136923e 100644 --- a/EDMI_ClientSuite/frmMain.Designer.vb +++ b/EDMI_ClientSuite/frmMain.Designer.vb @@ -32,7 +32,6 @@ Partial Class frmMain Me.LabelCurrentVersion = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.SkinDropDownButtonItem1 = New DevExpress.XtraBars.SkinDropDownButtonItem() - Me.BarButtonEntityDesigner = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonDeleteControl = New DevExpress.XtraBars.BarButtonItem() Me.LabelCurrentLanguage = New DevExpress.XtraBars.BarStaticItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() @@ -69,7 +68,7 @@ Partial Class frmMain ' Me.RibbonControl.ApplicationButtonDropDownControl = Me.MainMenu Me.RibbonControl.ExpandCollapseItem.Id = 0 - Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.SkinDropDownButtonItem1, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings, Me.LabelCurrentLanguage, Me.BarButtonItem2, Me.BarWorkspaceMenuItem1, Me.LabelServiceOnline, Me.BarButtonUserManager, Me.LabelServiceOffline, Me.BarButtonItem3, Me.BarButtonFormDesigner, Me.BarButtonItem4}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.SkinDropDownButtonItem1, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings, Me.LabelCurrentLanguage, Me.BarButtonItem2, Me.BarWorkspaceMenuItem1, Me.LabelServiceOnline, Me.BarButtonUserManager, Me.LabelServiceOffline, Me.BarButtonItem3, Me.BarButtonFormDesigner, Me.BarButtonItem4}) Me.RibbonControl.Location = New System.Drawing.Point(0, 0) Me.RibbonControl.MaxItemId = 25 Me.RibbonControl.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always @@ -147,14 +146,6 @@ Partial Class frmMain Me.SkinDropDownButtonItem1.Id = 10 Me.SkinDropDownButtonItem1.Name = "SkinDropDownButtonItem1" ' - 'BarButtonEntityDesigner - ' - Me.BarButtonEntityDesigner.Caption = "Entitäten Designer" - Me.BarButtonEntityDesigner.Id = 12 - Me.BarButtonEntityDesigner.ImageOptions.Image = CType(resources.GetObject("BarButtonEntityDesigner.ImageOptions.Image"), System.Drawing.Image) - Me.BarButtonEntityDesigner.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonEntityDesigner.ImageOptions.LargeImage"), System.Drawing.Image) - Me.BarButtonEntityDesigner.Name = "BarButtonEntityDesigner" - ' 'BarButtonDeleteControl ' Me.BarButtonDeleteControl.Caption = "Delete Control" @@ -265,7 +256,6 @@ Partial Class frmMain ' 'RibbonPageGroup1 ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonEntityDesigner) Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonFormDesigner) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Inhalte" @@ -366,7 +356,6 @@ Partial Class frmMain Friend WithEvents DockManager As DevExpress.XtraBars.Docking.DockManager Friend WithEvents SkinDropDownButtonItem1 As DevExpress.XtraBars.SkinDropDownButtonItem Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents BarButtonEntityDesigner As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonDeleteControl As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonConnectionSettings As DevExpress.XtraBars.BarButtonItem Friend WithEvents LabelCurrentLanguage As DevExpress.XtraBars.BarStaticItem diff --git a/EDMI_ClientSuite/frmMain.resx b/EDMI_ClientSuite/frmMain.resx index 3ac9cdd8..ed5110e8 100644 --- a/EDMI_ClientSuite/frmMain.resx +++ b/EDMI_ClientSuite/frmMain.resx @@ -258,34 +258,6 @@ 6rZH6NG6Ev4hdBEzYOFbB1GRcZPAQzo2yVt0MLNPoaESGiqhoRIaKqEhSCnZTSZndNB7gO0ANATe5J/r hfs556WUMvqxn7U7/0ND8ESg1kolZAIoJiEVQPUScgHUJjFD4hMBVJPwf4eH2aAheCJwws+v0D00BGh8 q7ZZdA8NQQiEQAiEQAiEQAig6U36+Q0aKqGhEhrqsGEFMnodJsvjoggAAAAASUVORK5CYII= - - - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAANdEVYdFRpdGxlAFdpemFyZDvJJTcGAAABNUlEQVQ4 - T6WTzUrDQBRGg6/UF3DlzocoKIg/CH0AFxLEhQTUpSt3KuJKy4CCYhQEEdy4Enc12DRU24WITebz3ukk - ziTTIHjgSybJvWdmQuIB+FeKge/7qInU54bZzLEEBVLqwS/8PAiCl7LE6xw0pygzMku5DqNBhPhiQ41N - 9ATfZYk6kOAxOllGEu7i9WgedM3FFiwwQ1iCnVgsoXe+gn7YQuewCZmNuMiJSxDEYhH9m5bK2+mC2kb2 - NeTCCpaAmqcpaXK5Wgh4NdHxHJLrbVrJ+N2YlAWblHZXrKmZu21ayd0eRPiA52jAhRUqWxhHone1pV7i - 2e0TF2B2XTglTgHfTD8/8H6/r5q4mXFJJgoU+iOqk9QLDHJJnlzyZwEzSUJUBa4wZYnGFpihIlcaFBYY - PxO8H2xiJi+n2GplAAAAAElFTkSuQmCC - - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAANdEVYdFRpdGxlAFdpemFyZDvJJTcGAAACOklEQVRY - R8WUTUtbQRSG3ZTiL+hfcNeFq/4Fof/ATQWrobWimyrdSTYiwU23oeCqhVJbNX5gq6JuWoTabSUWqU2u - JiYIJpKY5PieJCP343jvzDXevvAwd05m5jxcJreLiP4rYjFKxGKUiMUoEYuKeDxOhvwFfYD3epB6iEUF - NmHQD69PJBJXyWSyD1P3WY65Qiwqwgik02lRIjIBjiRxZ4FK7nf76fbY17sltASO3z/rB49sNWpUy1Tc - m6PjDwM89Y1dgNOWqLKErsAKqIENECsffafsl3E6ScUIcyzxj1uAoyTwm+diMo4Jmkxws9y3V2QtDVN2 - YYjyeC7sjmsL+JDBEkc/xjFBkyeZT4PNhm50BPzCEoijH+OYoMkDcFnYGfMI8Bsp/nhHjXoNS82jKzBo - LQ57mitYIrcxTfXKBZabJVAAzXtAKb85KjZn8lujdLIcIys1QbWLPLbpx1cAjR+C/dPVF5RbH7m5eIrT - tZfEd8NKTdL5r49ULfzBNrMECTwGMyAJ5sE2aCgB/gZUzg6xlOjp1GpzNI3WHbADgbcW/yW/4o1sz6LU - ykHmvCnBo0nCCHRby28o+/k5Xf776WgaRsJYgKkWj3DzX+N7XMe09frDSoQSAFQrnfHQjLupiUQogfYm - R8JKdEyAY2/Ko8JPoqMCHHfzIImOC3BMJO5FgKMrEVogCE6QhG2tp4encBs4MIheIIn0SucpxKIEDtJB - lHCfZUcsSuAgXdwSkb4BhZLgUTyvBXVdA6q9hTy63+d5AAAAAElFTkSuQmCC @@ -331,31 +303,30 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAEHRFWHRUaXRsZQBNYXNrO1Jv - bGU7urHsswAAAN5JREFUOE+dkr0NgmAURYmtE7gAhdHKMWyxdQILwwCULuAEhugAroCNO1CZWCr2FHqP - eR/5QEiE4kTuz7vBhOB5iUvxHkjJQNEw+1AwkDfMPuQMZCZOYinG9ot2xa4sYyA1MRNoB9oNdGUpIjEx - 5A0SBiITQ4gYCMXLM/+Fm9D9p7OZfeAmcANbM/vATTUwFe57WJjXBhkdutxUA7AThHsxMs8Hj4wO3a/v - F+biKigcxUpMDJ7xyOjQ/RmAtXgIim2Q0alu/GPHRtxF8xiPrNavCQ++toO4GTzjNXpx8AFGzsQFb2mX - gAAAAABJRU5ErkJggg== + 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 + auQPQiXhdkHlGrsAAAAASUVORK5CYII= diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index 289d236e..1c7662a9 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -132,12 +132,6 @@ Public Class frmMain frm.Show() End Sub - Private Sub BarButtonEntityDesigner_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonEntityDesigner.ItemClick - Dim frm As New frmEntityDesigner() - frm.MdiParent = DocumentManager.MdiParent - frm.Show() - End Sub - Private Sub BarButtonFormDesigner_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonFormDesigner.ItemClick Dim oForm As New frmFormDesigner() oForm.MdiParent = DocumentManager.MdiParent @@ -221,6 +215,9 @@ Public Class frmMain End Sub Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick - + Dim oForm As New frmWorkflowStep(142) With { + .MdiParent = DocumentManager.MdiParent + } + oForm.Show() End Sub End Class \ No newline at end of file