From c0d37ef78978b0a0473eeace5b70dc140fc77f58 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 13 Mar 2019 16:14:56 +0100 Subject: [PATCH] Tiny EDMI changes --- EDMI_ClientSuite/ClassPanelManager.vb | 1 + EDMI_ClientSuite/frmObjectEditor.Designer.vb | 21 ++++++++++---------- EDMI_ClientSuite/frmObjectEditor.vb | 5 ++++- 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/EDMI_ClientSuite/ClassPanelManager.vb b/EDMI_ClientSuite/ClassPanelManager.vb index 803751bb..5f5f45fa 100644 --- a/EDMI_ClientSuite/ClassPanelManager.vb +++ b/EDMI_ClientSuite/ClassPanelManager.vb @@ -39,6 +39,7 @@ Public Class ClassPanelManager Private Sub View_DocumentDeactivated(sender As Object, e As DocumentEventArgs) Dim oDocument As BaseDocument = e.Document + ' TODO: oDocument.Control can be nothing Dim oHashcode As Integer = oDocument.Control.GetHashCode If oDocument Is Nothing Then diff --git a/EDMI_ClientSuite/frmObjectEditor.Designer.vb b/EDMI_ClientSuite/frmObjectEditor.Designer.vb index e80437de..599aff3f 100644 --- a/EDMI_ClientSuite/frmObjectEditor.Designer.vb +++ b/EDMI_ClientSuite/frmObjectEditor.Designer.vb @@ -22,6 +22,7 @@ Partial Class frmObjectEditor '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(frmObjectEditor)) Me.SplitContainer = New DevExpress.XtraEditors.SplitContainerControl() Me.GridList = New DevExpress.XtraGrid.GridControl() @@ -53,13 +54,13 @@ Partial Class frmObjectEditor 'SplitContainer ' Me.SplitContainer.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainer.Location = New System.Drawing.Point(0, 143) + Me.SplitContainer.Location = New System.Drawing.Point(0, 146) Me.SplitContainer.Name = "SplitContainer" Me.SplitContainer.Panel1.Controls.Add(Me.GridList) Me.SplitContainer.Panel1.Text = "Panel1" Me.SplitContainer.Panel2.Controls.Add(Me.LayoutControl1) Me.SplitContainer.Panel2.Text = "Panel2" - Me.SplitContainer.Size = New System.Drawing.Size(1104, 331) + Me.SplitContainer.Size = New System.Drawing.Size(1104, 338) Me.SplitContainer.SplitterPosition = 547 Me.SplitContainer.TabIndex = 0 Me.SplitContainer.Text = "SplitContainerControl1" @@ -70,7 +71,7 @@ Partial Class frmObjectEditor Me.GridList.Location = New System.Drawing.Point(0, 0) Me.GridList.MainView = Me.ViewList Me.GridList.Name = "GridList" - Me.GridList.Size = New System.Drawing.Size(547, 331) + Me.GridList.Size = New System.Drawing.Size(547, 338) Me.GridList.TabIndex = 0 Me.GridList.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewList}) ' @@ -86,7 +87,7 @@ Partial Class frmObjectEditor Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = New System.Drawing.Rectangle(-870, 211, 650, 400) Me.LayoutControl1.Root = Me.LayoutGroup - Me.LayoutControl1.Size = New System.Drawing.Size(552, 331) + Me.LayoutControl1.Size = New System.Drawing.Size(545, 338) Me.LayoutControl1.TabIndex = 0 Me.LayoutControl1.Text = "LayoutControl1" ' @@ -95,7 +96,7 @@ Partial Class frmObjectEditor Me.LayoutGroup.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.LayoutGroup.GroupBordersVisible = False Me.LayoutGroup.Name = "Root" - Me.LayoutGroup.Size = New System.Drawing.Size(552, 331) + Me.LayoutGroup.Size = New System.Drawing.Size(545, 338) Me.LayoutGroup.TextVisible = False ' 'RibbonControl1 @@ -107,7 +108,7 @@ Partial Class frmObjectEditor Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.Size = New System.Drawing.Size(1104, 143) + Me.RibbonControl1.Size = New System.Drawing.Size(1104, 146) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'BarButtonSave @@ -188,17 +189,17 @@ Partial Class frmObjectEditor ' Me.RibbonStatusBar1.ItemLinks.Add(Me.labelParentAttributeId) Me.RibbonStatusBar1.ItemLinks.Add(Me.labelSyskey) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 474) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 484) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1104, 31) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1104, 21) ' 'RibbonPage2 ' Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'frmEdit + 'frmObjectEditor ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font @@ -206,7 +207,7 @@ Partial Class frmObjectEditor Me.Controls.Add(Me.SplitContainer) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) - Me.Name = "frmEdit" + Me.Name = "frmObjectEditor" Me.Ribbon = Me.RibbonControl1 Me.ShowIcon = False Me.StatusBar = Me.RibbonStatusBar1 diff --git a/EDMI_ClientSuite/frmObjectEditor.vb b/EDMI_ClientSuite/frmObjectEditor.vb index a78a601a..b0c4f3f3 100644 --- a/EDMI_ClientSuite/frmObjectEditor.vb +++ b/EDMI_ClientSuite/frmObjectEditor.vb @@ -140,9 +140,12 @@ Public Class frmObjectEditor oEditor = oCheckEdit Case Else - oEditor = New TextEdit() With { + Dim oTextEdit = New MemoEdit() With { .Name = Column.ColumnName } + + oEditor = oTextEdit + End Select