From d93d9142ffd7dd86305f052335acb61278a469ab Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 5 Mar 2019 14:31:04 +0100 Subject: [PATCH] Add DocTest Form for Editing DocValues --- EDMI_ClientSuite/ClientSuite.vbproj | 19 ++- .../FormUserManager/frmUserManager.vb | 4 +- EDMI_ClientSuite/frmDocTest.Designer.vb | 119 +++++++++++++++++ EDMI_ClientSuite/frmDocTest.resx | 120 ++++++++++++++++++ EDMI_ClientSuite/frmDocTest.vb | 52 ++++++++ EDMI_ClientSuite/frmFileTest.Designer.vb | 32 +++++ EDMI_ClientSuite/frmFileTest.vb | 2 +- EDMI_ClientSuite/frmMain.Designer.vb | 28 +++- EDMI_ClientSuite/frmMain.resx | 72 ++++++++--- EDMI_ClientSuite/frmMain.vb | 7 + ...esigner.vb => frmObjectEditor.Designer.vb} | 4 +- .../{frmEdit.resx => frmObjectEditor.resx} | 0 .../{frmEdit.vb => frmObjectEditor.vb} | 2 +- 13 files changed, 426 insertions(+), 35 deletions(-) create mode 100644 EDMI_ClientSuite/frmDocTest.Designer.vb create mode 100644 EDMI_ClientSuite/frmDocTest.resx create mode 100644 EDMI_ClientSuite/frmDocTest.vb rename EDMI_ClientSuite/{frmEdit.Designer.vb => frmObjectEditor.Designer.vb} (99%) rename EDMI_ClientSuite/{frmEdit.resx => frmObjectEditor.resx} (100%) rename EDMI_ClientSuite/{frmEdit.vb => frmObjectEditor.vb} (99%) diff --git a/EDMI_ClientSuite/ClientSuite.vbproj b/EDMI_ClientSuite/ClientSuite.vbproj index 89ae5ee6..a4e4dcc2 100644 --- a/EDMI_ClientSuite/ClientSuite.vbproj +++ b/EDMI_ClientSuite/ClientSuite.vbproj @@ -134,6 +134,12 @@ Form + + frmDocTest.vb + + + Form + @@ -204,10 +210,10 @@ Form - - frmEdit.vb + + frmObjectEditor.vb - + Form @@ -261,6 +267,9 @@ DockManagerTest.vb + + frmDocTest.vb + frmStaticListEditor.vb @@ -288,8 +297,8 @@ frmConfigUser.vb - - frmEdit.vb + + frmObjectEditor.vb frmUserManager.vb diff --git a/EDMI_ClientSuite/FormUserManager/frmUserManager.vb b/EDMI_ClientSuite/FormUserManager/frmUserManager.vb index 6eac8670..6c5d732d 100644 --- a/EDMI_ClientSuite/FormUserManager/frmUserManager.vb +++ b/EDMI_ClientSuite/FormUserManager/frmUserManager.vb @@ -137,12 +137,12 @@ Public Class frmUserManager End Function Private Sub BarButtonUserEdit_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonUserEdit.ItemClick - Dim oForm As New frmEdit(ClassConstants.DB_USER_ATTRIBUTE_ID, ClassConstants.DB_USER_ATTRIBUTE_SYSKEY, _UserTable) + Dim oForm As New frmObjectEditor(ClassConstants.DB_USER_ATTRIBUTE_ID, ClassConstants.DB_USER_ATTRIBUTE_SYSKEY, _UserTable) oForm.Show() End Sub Private Sub BarButtonGroupEdit_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonGroupEdit.ItemClick - Dim oForm As New frmEdit(ClassConstants.DB_GROUP_ATTRIBUTE_ID, ClassConstants.DB_GROUP_ATTRIBUTE_SYSKEY, _GroupTable) + Dim oForm As New frmObjectEditor(ClassConstants.DB_GROUP_ATTRIBUTE_ID, ClassConstants.DB_GROUP_ATTRIBUTE_SYSKEY, _GroupTable) oForm.Show() End Sub diff --git a/EDMI_ClientSuite/frmDocTest.Designer.vb b/EDMI_ClientSuite/frmDocTest.Designer.vb new file mode 100644 index 00000000..444f4575 --- /dev/null +++ b/EDMI_ClientSuite/frmDocTest.Designer.vb @@ -0,0 +1,119 @@ + _ +Partial Class frmDocTest + Inherits BaseForm + + '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.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.txtDoctype = New System.Windows.Forms.TextBox() + Me.Button1 = New System.Windows.Forms.Button() + Me.txtDocId = New System.Windows.Forms.TextBox() + Me.Label1 = New System.Windows.Forms.Label() + Me.Label2 = New System.Windows.Forms.Label() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'GridControl1 + ' + Me.GridControl1.Dock = System.Windows.Forms.DockStyle.Top + Me.GridControl1.Location = New System.Drawing.Point(0, 0) + Me.GridControl1.MainView = Me.GridView1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(800, 267) + Me.GridControl1.TabIndex = 0 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) + ' + 'GridView1 + ' + Me.GridView1.GridControl = Me.GridControl1 + Me.GridView1.Name = "GridView1" + ' + 'txtDoctype + ' + Me.txtDoctype.Location = New System.Drawing.Point(100, 299) + Me.txtDoctype.Name = "txtDoctype" + Me.txtDoctype.Size = New System.Drawing.Size(100, 20) + Me.txtDoctype.TabIndex = 1 + ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(652, 511) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(136, 56) + Me.Button1.TabIndex = 2 + Me.Button1.Text = "Speichern" + Me.Button1.UseVisualStyleBackColor = True + ' + 'TextBox1 + ' + Me.txtDocId.Location = New System.Drawing.Point(100, 273) + Me.txtDocId.Name = "TextBox1" + Me.txtDocId.Size = New System.Drawing.Size(100, 20) + Me.txtDocId.TabIndex = 3 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.Location = New System.Drawing.Point(12, 302) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(47, 13) + Me.Label1.TabIndex = 4 + Me.Label1.Text = "Doctype" + ' + 'Label2 + ' + Me.Label2.AutoSize = True + Me.Label2.Location = New System.Drawing.Point(12, 276) + Me.Label2.Name = "Label2" + Me.Label2.Size = New System.Drawing.Size(36, 13) + Me.Label2.TabIndex = 4 + Me.Label2.Text = "DocId" + ' + 'frmDocTest + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 579) + Me.Controls.Add(Me.Label2) + Me.Controls.Add(Me.Label1) + Me.Controls.Add(Me.txtDocId) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.txtDoctype) + Me.Controls.Add(Me.GridControl1) + Me.Name = "frmDocTest" + Me.Text = "DocValue Test" + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + Me.PerformLayout() + + End Sub + + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents txtDoctype As TextBox + Friend WithEvents Button1 As Button + Friend WithEvents txtDocId As TextBox + Friend WithEvents Label1 As Label + Friend WithEvents Label2 As Label +End Class diff --git a/EDMI_ClientSuite/frmDocTest.resx b/EDMI_ClientSuite/frmDocTest.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/EDMI_ClientSuite/frmDocTest.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/EDMI_ClientSuite/frmDocTest.vb b/EDMI_ClientSuite/frmDocTest.vb new file mode 100644 index 00000000..ad65684e --- /dev/null +++ b/EDMI_ClientSuite/frmDocTest.vb @@ -0,0 +1,52 @@ +Imports DevExpress.XtraGrid + +Public Class frmDocTest + Private Sub DocTest_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Try + Dim oControlPatcher = New ClassControlPatcher(Of GridControl)(Me) + oControlPatcher. + ProcessContainer(AddressOf ClassGridControl.DefaultGridSettings). + ProcessContainer(AddressOf ClassGridControl.ReadOnlyGridSettings) + + Dim oSQL = "SELECT * FROM VWICM_DOC_METADATA_DE" + My.Channel.CreateDatabaseRequest("Load Doc Values", True) + + Dim oResult = My.Channel.ReturnDatatable(oSQL) + + If Not oResult.OK Then + MsgBox(oResult.ErrorMessage) + Exit Sub + End If + + My.Channel.CloseDatabaseRequest() + + Dim oDatatable As DataTable = oResult.Table + + + txtDoctype.DataBindings.Add(New Binding("Text", oDatatable, "DOCTYPE")) + txtDocId.DataBindings.Add(New Binding("Text", oDatatable, "DOC_ID")) + + GridControl1.DataSource = oDatatable + Catch ex As Exception + _ErrorHandler.ShowErrorMessage(ex) + End Try + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Dim oDocId As Int64 = Int64.Parse(txtDocId.Text) + Dim oValue As String = txtDoctype.Text + Dim oSyskey As String = "001-DOCTYPE" + + Dim oSQL = $"SELECT FNICM_NEW_DOC_VALUE({oDocId}, '{oSyskey}', '{My.Application.User.Language}', '{My.Application.User.UserName}', '{oValue}') FROM RDB$DATABASE;" + My.Channel.CreateDatabaseRequest("Save Doc Value", True) + + Dim oResult = My.Channel.ReturnScalar(oSQL) + + If Not oResult.OK Then + MsgBox(oResult.ErrorMessage) + Exit Sub + End If + + My.Channel.CloseDatabaseRequest() + End Sub +End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmFileTest.Designer.vb b/EDMI_ClientSuite/frmFileTest.Designer.vb index d343ea22..c7eafa56 100644 --- a/EDMI_ClientSuite/frmFileTest.Designer.vb +++ b/EDMI_ClientSuite/frmFileTest.Designer.vb @@ -28,6 +28,9 @@ Partial Class frmFileTest Me.TextBox1 = New System.Windows.Forms.TextBox() Me.btnDocByContainerId = New System.Windows.Forms.Button() Me.TextBox2 = New System.Windows.Forms.TextBox() + Me.TextBox3 = New System.Windows.Forms.TextBox() + Me.TextBox4 = New System.Windows.Forms.TextBox() + Me.Button2 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'Button1 @@ -80,11 +83,37 @@ Partial Class frmFileTest Me.TextBox2.Size = New System.Drawing.Size(224, 20) Me.TextBox2.TabIndex = 3 ' + 'TextBox3 + ' + Me.TextBox3.Location = New System.Drawing.Point(425, 138) + Me.TextBox3.Name = "TextBox3" + Me.TextBox3.Size = New System.Drawing.Size(224, 20) + Me.TextBox3.TabIndex = 5 + ' + 'TextBox4 + ' + Me.TextBox4.Location = New System.Drawing.Point(425, 112) + Me.TextBox4.Name = "TextBox4" + Me.TextBox4.Size = New System.Drawing.Size(224, 20) + Me.TextBox4.TabIndex = 5 + ' + 'Button2 + ' + Me.Button2.Location = New System.Drawing.Point(655, 126) + Me.Button2.Name = "Button2" + Me.Button2.Size = New System.Drawing.Size(133, 32) + Me.Button2.TabIndex = 4 + Me.Button2.Text = "GetDocByContainerId" + Me.Button2.UseVisualStyleBackColor = True + ' 'frmFileTest ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.TextBox4) + Me.Controls.Add(Me.TextBox3) + Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.btnDocByContainerId) Me.Controls.Add(Me.TextBox2) Me.Controls.Add(Me.TextBox1) @@ -104,4 +133,7 @@ Partial Class frmFileTest Friend WithEvents TextBox1 As TextBox Friend WithEvents btnDocByContainerId As Button Friend WithEvents TextBox2 As TextBox + Friend WithEvents TextBox3 As TextBox + Friend WithEvents TextBox4 As TextBox + Friend WithEvents Button2 As Button End Class diff --git a/EDMI_ClientSuite/frmFileTest.vb b/EDMI_ClientSuite/frmFileTest.vb index ed8d94fb..14150ab0 100644 --- a/EDMI_ClientSuite/frmFileTest.vb +++ b/EDMI_ClientSuite/frmFileTest.vb @@ -64,7 +64,7 @@ Public Class frmFileTest End Try End Sub - Private Sub btnDocByContainerId_Click(sender As Object, e As EventArgs) Handles btnDocByContainerId.Click + Private Sub btnDocByContainerId_Click(sender As Object, e As EventArgs) Handles btnDocByContainerId.Click, Button2.Click Try Dim oContainerId As Int64 = Int64.Parse(TextBox2.Text) Dim oResult = _fileOp.GetDocumentByContainerId(oContainerId) diff --git a/EDMI_ClientSuite/frmMain.Designer.vb b/EDMI_ClientSuite/frmMain.Designer.vb index 397aa3d2..7d381f87 100644 --- a/EDMI_ClientSuite/frmMain.Designer.vb +++ b/EDMI_ClientSuite/frmMain.Designer.vb @@ -19,10 +19,11 @@ Partial Class frmMain 'Do not modify it using the code editor. Private Sub InitializeComponent() + Me.components = New System.ComponentModel.Container() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmMain)) Dim PushTransition1 As DevExpress.Utils.Animation.PushTransition = New DevExpress.Utils.Animation.PushTransition() Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu() + Me.MainMenu = New DevExpress.XtraBars.Ribbon.ApplicationMenu(Me.components) Me.BarButtonExit = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonUserSettings = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonConnectionSettings = New DevExpress.XtraBars.BarButtonItem() @@ -52,9 +53,9 @@ Partial Class frmMain Me.RibbonPageAdmin = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.DocumentManager = New DevExpress.XtraBars.Docking2010.DocumentManager() - Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView() - Me.DockManager = New DevExpress.XtraBars.Docking.DockManager() + Me.DocumentManager = New DevExpress.XtraBars.Docking2010.DocumentManager(Me.components) + Me.TabbedView1 = New DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(Me.components) + Me.DockManager = New DevExpress.XtraBars.Docking.DockManager(Me.components) Me.panelContainer1 = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanelGlobix = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() @@ -62,6 +63,7 @@ Partial Class frmMain Me.DockPanelProcessManager = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel2_Container = New DevExpress.XtraBars.Docking.ControlContainer() Me.ProcessManagerWidget = New DigitalData.GUIs.ClientSuite.ProcessManagerWidget() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.MainMenu, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DocumentManager, System.ComponentModel.ISupportInitialize).BeginInit() @@ -78,9 +80,9 @@ 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.BarButtonDock1, Me.SkinDropDownButtonItem1, Me.BarButtonDashboard, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings, Me.LabelCurrentLanguage, Me.BarButtonItem2, Me.BarWorkspaceMenuItem1, Me.LabelServiceOnline, Me.BarButtonUserManager, Me.LabelServiceOffline}) + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.BarButtonExit, Me.BarButtonUserSettings, Me.LabelCurrentUser, Me.LabelCurrentMachine, Me.LabelCurrentVersion, Me.BarButtonItem1, Me.BarButtonDock1, Me.SkinDropDownButtonItem1, Me.BarButtonDashboard, Me.BarButtonEntityDesigner, Me.BarButtonDeleteControl, Me.BarButtonConnectionSettings, Me.LabelCurrentLanguage, Me.BarButtonItem2, Me.BarWorkspaceMenuItem1, Me.LabelServiceOnline, Me.BarButtonUserManager, Me.LabelServiceOffline, Me.BarButtonItem3}) Me.RibbonControl.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl.MaxItemId = 21 + Me.RibbonControl.MaxItemId = 22 Me.RibbonControl.MdiMergeStyle = DevExpress.XtraBars.Ribbon.RibbonMdiMergeStyle.Always Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.PageHeaderItemLinks.Add(Me.SkinDropDownButtonItem1) @@ -147,6 +149,8 @@ Partial Class frmMain ' Me.BarButtonItem1.Caption = "File Test" Me.BarButtonItem1.Id = 8 + 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" ' 'BarButtonDock1 @@ -246,9 +250,10 @@ Partial Class frmMain 'RibbonPageGroup3 ' Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - Me.RibbonPageGroup3.Text = "RibbonPageGroup3" + Me.RibbonPageGroup3.Text = "DEBUG" ' 'RibbonPageView ' @@ -391,6 +396,14 @@ Partial Class frmMain Me.ProcessManagerWidget.Size = New System.Drawing.Size(337, 174) Me.ProcessManagerWidget.TabIndex = 0 ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "DocTest" + Me.BarButtonItem3.Id = 21 + Me.BarButtonItem3.ImageOptions.Image = CType(resources.GetObject("BarButtonItem3.ImageOptions.Image"), System.Drawing.Image) + Me.BarButtonItem3.ImageOptions.LargeImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.LargeImage"), System.Drawing.Image) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'frmMain ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -461,4 +474,5 @@ Partial Class frmMain Friend WithEvents RibbonPageAdmin As DevExpress.XtraBars.Ribbon.RibbonPage Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents LabelServiceOffline As DevExpress.XtraBars.BarStaticItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem End Class diff --git a/EDMI_ClientSuite/frmMain.resx b/EDMI_ClientSuite/frmMain.resx index ad93097d..4e3e31d2 100644 --- a/EDMI_ClientSuite/frmMain.resx +++ b/EDMI_ClientSuite/frmMain.resx @@ -218,28 +218,47 @@ - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJXRFWHRUaXRsZQBCdWlsZDtT - ZXR0aW5ncztDdXN0b21pejtPcHRpb25zWQmgmAAAAL5JREFUOE+9kUEKAjEMRQe6mGPMGeo9BO/hzsUc - QLv3OOMBXM9RXBcU4/+QwQZmmuLCwCMk5P+mbScihpSSOJh5UxAObcV/DIAXZt4Uj/tJSpZY6bcZbFFq - WgxeYAb9QqnxDNjr9udbOFymHXLWHFoMeDLFAkZwBG/NrCGpG8wYCjr8pKCA9egZ9LouT6ToCgbNrNmP - VQMMZMC1KRjQ45Vowpr97BlE8PMG7huAYAzWUEHbL9SAgNfhm8RvX7oP7LDQAsI0/DoAAAAASUVORK5C - YII= + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAEJ1aWxkO1NldHRpbmdzO0N1c3Rv + bWl6O09wdGlvbnNZCaCYAAAAvklEQVQ4T72RQQoCMQxFB7qYY8wZ6j0E7+HOxRxAu/c44wFcz1FcFxTj + /5DBBmaa4sLAIyTk/6ZtJyKGlJI4mHlTEA5txX8MgBdm3hSP+0lKlljptxlsUWpaDF5gBv1CqfEM2Ov2 + 51s4XKYdctYcWgx4MsUCRnAEb82sIakbzBgKOvykoID16Bn0ui5PpOgKBs2s2Y9VAwxkwLUpGNDjlWjC + mv3sGUTw8wbuG4BgDNZQQdsv1ICA1+GbxG9fug/ssNACwjT8OgAAAABJRU5ErkJggg== + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAldEVYdFRpdGxlAEJ1aWxkO1NldHRpbmdzO0N1c3Rv + bWl6O09wdGlvbnNZCaCYAAABy0lEQVRYR82VPU7DQBSEc4O0UZQ2TZooB6HMRZCoIyFXdFyDE3AAKqrQ + 0keIBkU0EQixzET7nJeXifAPllnpU9azb2d27bUzSCn1ihQjRVGkBnCe9PNIUVC7VQknUvS4HdUmeimk + 6MlGtVtehPT0SDHQuLVeQN5FK6JnRIpGNmjcWi8A/EVTviVSJG8Pl+kc3187lBwar1WdgSYziBSJMjI+ + Xh9Rcmi8VnUGmswgUiTKyHh/ut2Hcuf85bWqM6K3R4pEGTUlenukSJRRU6K3R4pEGTUlenukSJRRRZ7B + 0KP8DSkSTFTmihewcawvru+nYJuZKn9DigRGKizC8AFCRmCM/hJcoT8HKTM3T9aAkc8pO5Ec8BsbGuag + O7AAE3ADPjPsU+MYa1hbLuIk2BBhCi6AuzLjKrB2bDknwYYIU/CZL2HI3akwxcLnHIV6QpCCp30N+Mx5 + iy2Ad2UFZhn2qdn4xOcchXpc0DmGMONp54Hjc7aAFcY4v4SaG2ct5+zfDhlOMFGFergAvmY05WGzgBnG + 4gJ4J2zcarfMkeEEE1Wo518soNdH0PshJN29hlWBYTcfoqrArJtPcR1oCMpdod/+z6gNCKn4d5wGP9ko + qHzFAnr7AAAAAElFTkSuQmCC + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAPXRFWHRUaXRsZQBOZXc7UGFn + ZTtCYXJzO1JpYmJvbjtTdGFuZGFyZDtJdGVtO0JsYW5rO0RlZmF1bHQ7RW1wdHk7EwRS7QAAAEtJREFU + OE9j+P//P0UYzmhpafmPB/+D0sbImkEYxQB8ACTf19d3F90QkgwAgl/ohpBkADIGAtIMQAajBowaAAI4 + DSAFYxhAHv7PAACenFKy9QHhCAAAAABJRU5ErkJggg== + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAJXRFWHRUaXRsZQBCdWlsZDtT - ZXR0aW5ncztDdXN0b21pejtPcHRpb25zWQmgmAAAActJREFUWEfNlT1Ow0AUhHODtFGUNk2aKAehzEWQ - qCMhV3RcgxNwACqq0NJHiAZFNBEIscxE+5yXl4nwD5ZZ6VPWs29ndu21M0gp9YoUI0VRpAZwnvTzSFFQ - u1UJJ1L0uB3VJnoppOjJRrVbXoT09Egx0Li1XkDeRSuiZ0SKRjZo3FovAPxFU74lUiRvD5fpHN9fO5Qc - Gq9VnYEmM4gUiTIyPl4fUXJovFZ1BprMIFIkysh4f7rdh3Ln/OW1qjOit0eKRBk1JXp7pEiUUVOit0eK - RBk1JXp7pEiUUUWewdCj/A0pEkxU5ooXsHGsL67vp2CbmSp/Q4oERioswvABQkZgjP4SXKE/BykzN0/W - gJHPKTuRHPAbGxrmoDuwABNwAz4z7FPjGGtYWy7iJNgQYQougLsy4yqwdmw5J8GGCFPwmS9hyN2pMMXC - 5xyFekKQgqd9DfjMeYstgHdlBWYZ9qnZ+MTnHIV6XNA5hjDjaeeB43O2gBXGOL+EmhtnLefs3w4ZTjBR - hXq4AL5mNOVhs4AZxuICeCds3Gq3zJHhBBNVqOdfLKDXR9D7ISTdvYZVgWE3H6KqwKybT3EdaAjKXaHf - /s+oDQip+HecBj/ZKKh8xQJ6+wAAAABJRU5ErkJggg== + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAPXRFWHRUaXRsZQBOZXc7UGFn + ZTtCYXJzO1JpYmJvbjtTdGFuZGFyZDtJdGVtO0JsYW5rO0RlZmF1bHQ7RW1wdHk7EwRS7QAAAKpJREFU + WEftkkEKhTAMRD2f5+q2R+jRuhL+IXQRM2DhWwdRkXGTwEM6NslbdDCzT6GhEhoqoaESGiqhIUgp2U0m + Z3TQe4DtADQE3uSf64X7OeellDL6sZ+1O/9DQ/BEoNZKJWQCKCYhFUD1EnIB1CYxQ+ITAVST8H+Hh9mg + IXgicMLPr9A9NARofKu2WXQPDUEIhEAIhEAIhEAIoOlN+vkNGiqhoRIa6rBhBTJ6HSbL46IIAAAAAElF + TkSuQmCC @@ -389,6 +408,25 @@ 7RfVl/q4z393Y7VwIr3Q4x+wnNN/wSvo9b7jSQJr5PQfUI/3KeLOdbpps3mdHr1/oqrXui6fkUsCinPa zfln5O7jMh5YLqf1fT7HJQGFbgX+dYPWUZ+VPiskAUWu6bHbVHI8hySgyI2i1GiyRn1WSAKK3DuUGk3W W58VxiTarZhsp2KynYrJ9ml1/AZUr3hglRjmdgAAAABJRU5ErkJggg== + + + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAFnRFWHRUaXRsZQBUZXh0O1Bh + Z2U7UmVwb3J0dmFhAAAAAFVJREFUOE9j+P//P0UYzmhpafmPB/+D0sbImkEYxQB8ACTf19d3F90QkgwA + gl/ohpBkADIGAtIMQAZ4DfBt2oEXg8CoC2jtAmIA7QwgBWMYQB7+zwAAuicvos+uzscAAAAASUVORK5C + YII= + + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 + YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAFnRFWHRUaXRsZQBUZXh0O1Bh + Z2U7UmVwb3J0dmFhAAAAALtJREFUWEftkkEKgzAURD2f0EuVbHOE3KOXyUroIdpF+gcMaBxKTWUs5Q88 + JKNJHh+HUsqp0FIJLZXQUgktQQih7GQyRgN7N7A7AC2BbbLH58H3McZnSmm0ZXvWar2ElqBHIOdMJWQC + CJOQCiCthFwAmSUekDhFAKkS9m7zY1ZoCXoE3nC3T+g9tATYeFTms+g9tAQ/J3C53naxjE/AJ+AT8An8 + xwS+iQt0CxxJe36FlkpoqYSWSmipowwv31jFbxjUc3kAAAAASUVORK5CYII= diff --git a/EDMI_ClientSuite/frmMain.vb b/EDMI_ClientSuite/frmMain.vb index d03fa66e..2731507e 100644 --- a/EDMI_ClientSuite/frmMain.vb +++ b/EDMI_ClientSuite/frmMain.vb @@ -192,4 +192,11 @@ Public Class frmMain Dim oParentRibbon As RibbonControl = TryCast(sender, RibbonControl) oParentRibbon.StatusBar.UnMergeStatusBar() End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + Dim frm As New frmDocTest With { + .MdiParent = DocumentManager.MdiParent + } + frm.Show() + End Sub End Class \ No newline at end of file diff --git a/EDMI_ClientSuite/frmEdit.Designer.vb b/EDMI_ClientSuite/frmObjectEditor.Designer.vb similarity index 99% rename from EDMI_ClientSuite/frmEdit.Designer.vb rename to EDMI_ClientSuite/frmObjectEditor.Designer.vb index 8779f305..e80437de 100644 --- a/EDMI_ClientSuite/frmEdit.Designer.vb +++ b/EDMI_ClientSuite/frmObjectEditor.Designer.vb @@ -1,5 +1,5 @@  -Partial Class frmEdit +Partial Class frmObjectEditor Inherits BaseRibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -22,7 +22,7 @@ Partial Class frmEdit 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmEdit)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmObjectEditor)) Me.SplitContainer = New DevExpress.XtraEditors.SplitContainerControl() Me.GridList = New DevExpress.XtraGrid.GridControl() Me.ViewList = New DevExpress.XtraGrid.Views.Grid.GridView() diff --git a/EDMI_ClientSuite/frmEdit.resx b/EDMI_ClientSuite/frmObjectEditor.resx similarity index 100% rename from EDMI_ClientSuite/frmEdit.resx rename to EDMI_ClientSuite/frmObjectEditor.resx diff --git a/EDMI_ClientSuite/frmEdit.vb b/EDMI_ClientSuite/frmObjectEditor.vb similarity index 99% rename from EDMI_ClientSuite/frmEdit.vb rename to EDMI_ClientSuite/frmObjectEditor.vb index 8076c20a..a90f5568 100644 --- a/EDMI_ClientSuite/frmEdit.vb +++ b/EDMI_ClientSuite/frmObjectEditor.vb @@ -3,7 +3,7 @@ Imports DevExpress.XtraGrid Imports DevExpress.XtraLayout Imports DigitalData.Modules.Logging -Public Class frmEdit +Public Class frmObjectEditor Private ReadOnly _Datatable As DataTable Private _BindingSource As BindingSource Private _LayoutConfig As ClassUIConfig.EditFormConfig