From a4b44bc5c3813785398cfd2fa2c15e215a419191 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 23 May 2023 11:54:31 +0200 Subject: [PATCH] Fix Colum Detail form --- app/TaskFlow/frmColumn_Detail.Designer.vb | 133 +++++++---------- app/TaskFlow/frmColumn_Detail.resx | 170 ++++++++-------------- app/TaskFlow/frmColumn_Detail.vb | 2 +- app/TaskFlow/frmValidator.vb | 8 +- 4 files changed, 120 insertions(+), 193 deletions(-) diff --git a/app/TaskFlow/frmColumn_Detail.Designer.vb b/app/TaskFlow/frmColumn_Detail.Designer.vb index abbd984..9f05acf 100644 --- a/app/TaskFlow/frmColumn_Detail.Designer.vb +++ b/app/TaskFlow/frmColumn_Detail.Designer.vb @@ -38,7 +38,6 @@ Partial Class frmColumn_Detail Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.LU_CAPTIONTextBox = New System.Windows.Forms.TextBox() - Me.TYPE_COLUMNComboBox = New System.Windows.Forms.ComboBox() Me.GUIDTextBox = New DevExpress.XtraEditors.TextEdit() Me.SPALTENNAMETextBox = New DevExpress.XtraEditors.TextEdit() Me.SPALTEN_HEADERTextBox = New DevExpress.XtraEditors.TextEdit() @@ -59,6 +58,7 @@ Partial Class frmColumn_Detail Me.DEFAULTVALUETextBox = New DevExpress.XtraEditors.TextEdit() Me.SEQUENCETextBox = New DevExpress.XtraEditors.SpinEdit() Me.SUMMARY_FUNCTIONCombobox = New DevExpress.XtraEditors.LookUpEdit() + Me.TYPE_COLUMNComboBox2 = New DevExpress.XtraEditors.LookUpEdit() Me.Root = New DevExpress.XtraLayout.LayoutControlGroup() Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem() @@ -81,10 +81,8 @@ Partial Class frmColumn_Detail Me.LayoutControlItem20 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem18 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem19 = New DevExpress.XtraLayout.LayoutControlItem() - Me.LayoutControlItem22 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem23 = New DevExpress.XtraLayout.LayoutControlItem() Me.LayoutControlItem21 = New DevExpress.XtraLayout.LayoutControlItem() - Me.TYPE_COLUMNComboBox2 = New DevExpress.XtraEditors.LookUpEdit() CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() @@ -108,6 +106,7 @@ Partial Class frmColumn_Detail CType(Me.DEFAULTVALUETextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SEQUENCETextBox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SUMMARY_FUNCTIONCombobox.Properties, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).BeginInit() @@ -130,10 +129,8 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'TBPM_CONTROL_TABLEBindingSource @@ -231,7 +228,6 @@ Partial Class frmColumn_Detail 'LayoutControl1 ' Me.LayoutControl1.Controls.Add(Me.LU_CAPTIONTextBox) - Me.LayoutControl1.Controls.Add(Me.TYPE_COLUMNComboBox) Me.LayoutControl1.Controls.Add(Me.GUIDTextBox) Me.LayoutControl1.Controls.Add(Me.SPALTENNAMETextBox) Me.LayoutControl1.Controls.Add(Me.SPALTEN_HEADERTextBox) @@ -263,14 +259,6 @@ Partial Class frmColumn_Detail resources.ApplyResources(Me.LU_CAPTIONTextBox, "LU_CAPTIONTextBox") Me.LU_CAPTIONTextBox.Name = "LU_CAPTIONTextBox" ' - 'TYPE_COLUMNComboBox - ' - Me.TYPE_COLUMNComboBox.DataBindings.Add(New System.Windows.Forms.Binding("Text", Me.TBPM_CONTROL_TABLEBindingSource, "TYPE_COLUMN", True)) - Me.TYPE_COLUMNComboBox.FormattingEnabled = True - Me.TYPE_COLUMNComboBox.Items.AddRange(New Object() {resources.GetString("TYPE_COLUMNComboBox.Items"), resources.GetString("TYPE_COLUMNComboBox.Items1"), resources.GetString("TYPE_COLUMNComboBox.Items2"), resources.GetString("TYPE_COLUMNComboBox.Items3"), resources.GetString("TYPE_COLUMNComboBox.Items4")}) - resources.ApplyResources(Me.TYPE_COLUMNComboBox, "TYPE_COLUMNComboBox") - Me.TYPE_COLUMNComboBox.Name = "TYPE_COLUMNComboBox" - ' 'GUIDTextBox ' Me.GUIDTextBox.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "GUID", True)) @@ -441,13 +429,24 @@ Partial Class frmColumn_Detail Me.SUMMARY_FUNCTIONCombobox.Properties.PopupSizeable = False Me.SUMMARY_FUNCTIONCombobox.StyleController = Me.LayoutControl1 ' + 'TYPE_COLUMNComboBox2 + ' + Me.TYPE_COLUMNComboBox2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "TYPE_COLUMN", True)) + resources.ApplyResources(Me.TYPE_COLUMNComboBox2, "TYPE_COLUMNComboBox2") + Me.TYPE_COLUMNComboBox2.MenuManager = Me.RibbonControl1 + Me.TYPE_COLUMNComboBox2.Name = "TYPE_COLUMNComboBox2" + Me.TYPE_COLUMNComboBox2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("TYPE_COLUMNComboBox2.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) + Me.TYPE_COLUMNComboBox2.Properties.NullText = resources.GetString("TYPE_COLUMNComboBox2.Properties.NullText") + Me.TYPE_COLUMNComboBox2.Properties.PopupSizeable = False + Me.TYPE_COLUMNComboBox2.StyleController = Me.LayoutControl1 + ' 'Root ' Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True] Me.Root.GroupBordersVisible = False - Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem12, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlGroup1, Me.LayoutControlItem18, Me.LayoutControlItem19, Me.LayoutControlItem22, Me.LayoutControlItem23, Me.LayoutControlItem21}) + Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3, Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem10, Me.LayoutControlItem12, Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlGroup1, Me.LayoutControlItem18, Me.LayoutControlItem19, Me.LayoutControlItem23, Me.LayoutControlItem21}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(556, 688) + Me.Root.Size = New System.Drawing.Size(573, 668) Me.Root.TextVisible = False ' 'LayoutControlItem1 @@ -456,7 +455,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem1.Size = New System.Drawing.Size(536, 40) + Me.LayoutControlItem1.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") Me.LayoutControlItem1.TextSize = New System.Drawing.Size(112, 13) ' @@ -466,7 +465,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 40) Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem2.Size = New System.Drawing.Size(536, 40) + Me.LayoutControlItem2.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2") Me.LayoutControlItem2.TextSize = New System.Drawing.Size(112, 13) ' @@ -476,7 +475,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 80) Me.LayoutControlItem3.Name = "LayoutControlItem3" Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem3.Size = New System.Drawing.Size(536, 40) + Me.LayoutControlItem3.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3") Me.LayoutControlItem3.TextSize = New System.Drawing.Size(112, 13) ' @@ -486,104 +485,104 @@ Partial Class frmColumn_Detail Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120) Me.LayoutControlItem4.Name = "LayoutControlItem4" Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem4.Size = New System.Drawing.Size(268, 40) + Me.LayoutControlItem4.Size = New System.Drawing.Size(276, 40) resources.ApplyResources(Me.LayoutControlItem4, "LayoutControlItem4") Me.LayoutControlItem4.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem5 ' Me.LayoutControlItem5.Control = Me.REGEX_MATCHTextBox - Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 241) + Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 200) Me.LayoutControlItem5.Name = "LayoutControlItem5" Me.LayoutControlItem5.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem5.Size = New System.Drawing.Size(457, 46) + Me.LayoutControlItem5.Size = New System.Drawing.Size(471, 46) resources.ApplyResources(Me.LayoutControlItem5, "LayoutControlItem5") Me.LayoutControlItem5.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem6 ' Me.LayoutControlItem6.Control = Me.SimpleButton1 - Me.LayoutControlItem6.Location = New System.Drawing.Point(457, 241) + Me.LayoutControlItem6.Location = New System.Drawing.Point(471, 200) Me.LayoutControlItem6.Name = "LayoutControlItem6" - Me.LayoutControlItem6.Size = New System.Drawing.Size(79, 46) + Me.LayoutControlItem6.Size = New System.Drawing.Size(82, 46) Me.LayoutControlItem6.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem6.TextVisible = False ' 'LayoutControlItem8 ' Me.LayoutControlItem8.Control = Me.SQL_COMMANDTextBox - Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 367) + Me.LayoutControlItem8.Location = New System.Drawing.Point(0, 326) Me.LayoutControlItem8.Name = "LayoutControlItem8" Me.LayoutControlItem8.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem8.Size = New System.Drawing.Size(457, 46) + Me.LayoutControlItem8.Size = New System.Drawing.Size(471, 46) resources.ApplyResources(Me.LayoutControlItem8, "LayoutControlItem8") Me.LayoutControlItem8.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem7 ' Me.LayoutControlItem7.Control = Me.REGEX_MESSAGE_DETextBox - Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 287) + Me.LayoutControlItem7.Location = New System.Drawing.Point(0, 246) Me.LayoutControlItem7.Name = "LayoutControlItem7" Me.LayoutControlItem7.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem7.Size = New System.Drawing.Size(536, 40) + Me.LayoutControlItem7.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem7, "LayoutControlItem7") Me.LayoutControlItem7.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem9 ' Me.LayoutControlItem9.Control = Me.SimpleButton2 - Me.LayoutControlItem9.Location = New System.Drawing.Point(457, 367) + Me.LayoutControlItem9.Location = New System.Drawing.Point(471, 326) Me.LayoutControlItem9.Name = "LayoutControlItem9" - Me.LayoutControlItem9.Size = New System.Drawing.Size(79, 46) + Me.LayoutControlItem9.Size = New System.Drawing.Size(82, 46) Me.LayoutControlItem9.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem9.TextVisible = False ' 'LayoutControlItem10 ' Me.LayoutControlItem10.Control = Me.TextEdit7 - Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 453) + Me.LayoutControlItem10.Location = New System.Drawing.Point(0, 412) Me.LayoutControlItem10.Name = "LayoutControlItem10" Me.LayoutControlItem10.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem10.Size = New System.Drawing.Size(268, 40) + Me.LayoutControlItem10.Size = New System.Drawing.Size(276, 40) resources.ApplyResources(Me.LayoutControlItem10, "LayoutControlItem10") Me.LayoutControlItem10.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem12 ' Me.LayoutControlItem12.Control = Me.CHANGED_WHOTextBox - Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 493) + Me.LayoutControlItem12.Location = New System.Drawing.Point(0, 452) Me.LayoutControlItem12.Name = "LayoutControlItem12" Me.LayoutControlItem12.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem12.Size = New System.Drawing.Size(268, 40) + Me.LayoutControlItem12.Size = New System.Drawing.Size(276, 40) resources.ApplyResources(Me.LayoutControlItem12, "LayoutControlItem12") Me.LayoutControlItem12.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem11 ' Me.LayoutControlItem11.Control = Me.TextEdit8 - Me.LayoutControlItem11.Location = New System.Drawing.Point(268, 453) + Me.LayoutControlItem11.Location = New System.Drawing.Point(276, 412) Me.LayoutControlItem11.Name = "LayoutControlItem11" Me.LayoutControlItem11.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem11.Size = New System.Drawing.Size(268, 40) + Me.LayoutControlItem11.Size = New System.Drawing.Size(277, 40) resources.ApplyResources(Me.LayoutControlItem11, "LayoutControlItem11") Me.LayoutControlItem11.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem13 ' Me.LayoutControlItem13.Control = Me.TextEdit10 - Me.LayoutControlItem13.Location = New System.Drawing.Point(268, 493) + Me.LayoutControlItem13.Location = New System.Drawing.Point(276, 452) Me.LayoutControlItem13.Name = "LayoutControlItem13" Me.LayoutControlItem13.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem13.Size = New System.Drawing.Size(268, 40) + Me.LayoutControlItem13.Size = New System.Drawing.Size(277, 40) resources.ApplyResources(Me.LayoutControlItem13, "LayoutControlItem13") Me.LayoutControlItem13.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlGroup1 ' Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem16, Me.LayoutControlItem14, Me.LayoutControlItem15, Me.LayoutControlItem17, Me.LayoutControlItem20}) - Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 533) + Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 492) Me.LayoutControlGroup1.Name = "LayoutControlGroup1" - Me.LayoutControlGroup1.Size = New System.Drawing.Size(536, 135) + Me.LayoutControlGroup1.Size = New System.Drawing.Size(553, 156) resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1") ' 'LayoutControlItem16 @@ -591,7 +590,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem16.Control = Me.VALIDATIONCheckbox Me.LayoutControlItem16.Location = New System.Drawing.Point(0, 0) Me.LayoutControlItem16.Name = "LayoutControlItem16" - Me.LayoutControlItem16.Size = New System.Drawing.Size(256, 24) + Me.LayoutControlItem16.Size = New System.Drawing.Size(264, 24) Me.LayoutControlItem16.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem16.TextVisible = False ' @@ -600,7 +599,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem14.Control = Me.READ_ONLYCheckBox Me.LayoutControlItem14.Location = New System.Drawing.Point(0, 24) Me.LayoutControlItem14.Name = "LayoutControlItem14" - Me.LayoutControlItem14.Size = New System.Drawing.Size(512, 22) + Me.LayoutControlItem14.Size = New System.Drawing.Size(529, 22) Me.LayoutControlItem14.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem14.TextVisible = False ' @@ -609,7 +608,7 @@ Partial Class frmColumn_Detail Me.LayoutControlItem15.Control = Me.LOAD_IDX_VALUECheckBox Me.LayoutControlItem15.Location = New System.Drawing.Point(0, 46) Me.LayoutControlItem15.Name = "LayoutControlItem15" - Me.LayoutControlItem15.Size = New System.Drawing.Size(512, 22) + Me.LayoutControlItem15.Size = New System.Drawing.Size(529, 22) Me.LayoutControlItem15.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem15.TextVisible = False ' @@ -618,80 +617,59 @@ Partial Class frmColumn_Detail Me.LayoutControlItem17.Control = Me.ADVANCED_LOOKUPCheckbox Me.LayoutControlItem17.Location = New System.Drawing.Point(0, 68) Me.LayoutControlItem17.Name = "LayoutControlItem17" - Me.LayoutControlItem17.Size = New System.Drawing.Size(512, 22) + Me.LayoutControlItem17.Size = New System.Drawing.Size(529, 43) Me.LayoutControlItem17.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem17.TextVisible = False ' 'LayoutControlItem20 ' Me.LayoutControlItem20.Control = Me.SUMMARY_FUNCTIONCombobox - Me.LayoutControlItem20.Location = New System.Drawing.Point(256, 0) + Me.LayoutControlItem20.Location = New System.Drawing.Point(264, 0) Me.LayoutControlItem20.Name = "LayoutControlItem20" - Me.LayoutControlItem20.Size = New System.Drawing.Size(256, 24) + Me.LayoutControlItem20.Size = New System.Drawing.Size(265, 24) resources.ApplyResources(Me.LayoutControlItem20, "LayoutControlItem20") Me.LayoutControlItem20.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem18 ' Me.LayoutControlItem18.Control = Me.DEFAULTVALUETextBox - Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 413) + Me.LayoutControlItem18.Location = New System.Drawing.Point(0, 372) Me.LayoutControlItem18.Name = "LayoutControlItem18" Me.LayoutControlItem18.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem18.Size = New System.Drawing.Size(536, 40) + Me.LayoutControlItem18.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem18, "LayoutControlItem18") Me.LayoutControlItem18.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem19 ' Me.LayoutControlItem19.Control = Me.SEQUENCETextBox - Me.LayoutControlItem19.Location = New System.Drawing.Point(268, 120) + Me.LayoutControlItem19.Location = New System.Drawing.Point(276, 120) Me.LayoutControlItem19.Name = "LayoutControlItem19" Me.LayoutControlItem19.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem19.Size = New System.Drawing.Size(268, 40) + Me.LayoutControlItem19.Size = New System.Drawing.Size(277, 40) resources.ApplyResources(Me.LayoutControlItem19, "LayoutControlItem19") Me.LayoutControlItem19.TextSize = New System.Drawing.Size(112, 13) ' - 'LayoutControlItem22 - ' - Me.LayoutControlItem22.Control = Me.TYPE_COLUMNComboBox - resources.ApplyResources(Me.LayoutControlItem22, "LayoutControlItem22") - Me.LayoutControlItem22.Location = New System.Drawing.Point(0, 160) - Me.LayoutControlItem22.Name = "LayoutControlItem22" - Me.LayoutControlItem22.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem22.Size = New System.Drawing.Size(536, 41) - Me.LayoutControlItem22.TextSize = New System.Drawing.Size(112, 13) - ' 'LayoutControlItem23 ' Me.LayoutControlItem23.Control = Me.LU_CAPTIONTextBox resources.ApplyResources(Me.LayoutControlItem23, "LayoutControlItem23") - Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 327) + Me.LayoutControlItem23.Location = New System.Drawing.Point(0, 286) Me.LayoutControlItem23.Name = "LayoutControlItem23" Me.LayoutControlItem23.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem23.Size = New System.Drawing.Size(536, 40) + Me.LayoutControlItem23.Size = New System.Drawing.Size(553, 40) Me.LayoutControlItem23.TextSize = New System.Drawing.Size(112, 13) ' 'LayoutControlItem21 ' Me.LayoutControlItem21.Control = Me.TYPE_COLUMNComboBox2 - Me.LayoutControlItem21.Location = New System.Drawing.Point(0, 201) + Me.LayoutControlItem21.Location = New System.Drawing.Point(0, 160) Me.LayoutControlItem21.Name = "LayoutControlItem21" Me.LayoutControlItem21.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) - Me.LayoutControlItem21.Size = New System.Drawing.Size(536, 40) + Me.LayoutControlItem21.Size = New System.Drawing.Size(553, 40) resources.ApplyResources(Me.LayoutControlItem21, "LayoutControlItem21") Me.LayoutControlItem21.TextSize = New System.Drawing.Size(112, 13) ' - 'TYPE_COLUMNComboBox2 - ' - Me.TYPE_COLUMNComboBox2.DataBindings.Add(New System.Windows.Forms.Binding("EditValue", Me.TBPM_CONTROL_TABLEBindingSource, "TYPE_COLUMN", True)) - resources.ApplyResources(Me.TYPE_COLUMNComboBox2, "TYPE_COLUMNComboBox2") - Me.TYPE_COLUMNComboBox2.MenuManager = Me.RibbonControl1 - Me.TYPE_COLUMNComboBox2.Name = "TYPE_COLUMNComboBox2" - Me.TYPE_COLUMNComboBox2.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("TYPE_COLUMNComboBox2.Properties.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))}) - Me.TYPE_COLUMNComboBox2.Properties.NullText = resources.GetString("TYPE_COLUMNComboBox2.Properties.NullText") - Me.TYPE_COLUMNComboBox2.Properties.PopupSizeable = False - Me.TYPE_COLUMNComboBox2.StyleController = Me.LayoutControl1 - ' 'frmColumn_Detail ' Me.Appearance.Options.UseFont = True @@ -729,6 +707,7 @@ Partial Class frmColumn_Detail CType(Me.DEFAULTVALUETextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SEQUENCETextBox.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SUMMARY_FUNCTIONCombobox.Properties, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem2, System.ComponentModel.ISupportInitialize).EndInit() @@ -751,10 +730,8 @@ Partial Class frmColumn_Detail CType(Me.LayoutControlItem20, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem18, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem19, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LayoutControlItem22, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem23, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LayoutControlItem21, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.TYPE_COLUMNComboBox2.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout @@ -813,8 +790,6 @@ End Sub Friend WithEvents LayoutControlItem19 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem20 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents SUMMARY_FUNCTIONCombobox As DevExpress.XtraEditors.LookUpEdit - Friend WithEvents TYPE_COLUMNComboBox As ComboBox - Friend WithEvents LayoutControlItem22 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LU_CAPTIONTextBox As TextBox Friend WithEvents LayoutControlItem16 As DevExpress.XtraLayout.LayoutControlItem Friend WithEvents LayoutControlItem23 As DevExpress.XtraLayout.LayoutControlItem diff --git a/app/TaskFlow/frmColumn_Detail.resx b/app/TaskFlow/frmColumn_Detail.resx index 502c756..c67ab1b 100644 --- a/app/TaskFlow/frmColumn_Detail.resx +++ b/app/TaskFlow/frmColumn_Detail.resx @@ -185,10 +185,10 @@ RibbonPage2 - 144, 347 + 144, 306 - 392, 20 + 409, 20 @@ -206,47 +206,11 @@ 4 - - TEXT - - - INTEGER - - - BOOLEAN - - - DOUBLE - - - CURRENCY - - - 144, 180 - - - 392, 21 - - - 25 - - - TYPE_COLUMNComboBox - - - System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - LayoutControl1 - - - 5 - 144, 20 - 392, 20 + 409, 20 4 @@ -261,13 +225,13 @@ LayoutControl1 - 6 + 5 144, 60 - 392, 20 + 409, 20 5 @@ -282,13 +246,13 @@ LayoutControl1 - 7 + 6 144, 100 - 392, 20 + 409, 20 6 @@ -303,7 +267,7 @@ LayoutControl1 - 8 + 7 0 @@ -316,7 +280,7 @@ Combo - 124, 20 + 132, 20 7 @@ -331,13 +295,13 @@ LayoutControl1 - 9 + 8 - 144, 261 + 144, 220 - 313, 20 + 327, 20 8 @@ -352,10 +316,10 @@ LayoutControl1 - 10 + 9 - 469, 253 + 483, 212 @@ -365,7 +329,7 @@ 10, 10, 10, 10 - 75, 42 + 78, 42 9 @@ -383,13 +347,13 @@ LayoutControl1 - 11 + 10 - 144, 307 + 144, 266 - 392, 20 + 409, 20 10 @@ -404,13 +368,13 @@ LayoutControl1 - 12 + 11 - 144, 387 + 144, 346 - 313, 20 + 327, 20 11 @@ -425,16 +389,16 @@ LayoutControl1 - 13 + 12 - 469, 379 + 483, 338 10, 10, 10, 10 - 75, 42 + 78, 42 12 @@ -452,13 +416,13 @@ LayoutControl1 - 14 + 13 - 144, 473 + 144, 432 - 124, 20 + 132, 20 13 @@ -473,13 +437,13 @@ LayoutControl1 - 15 + 14 - 412, 473 + 420, 432 - 124, 20 + 133, 20 14 @@ -494,13 +458,13 @@ LayoutControl1 - 16 + 15 - 144, 513 + 144, 472 - 124, 20 + 132, 20 15 @@ -515,13 +479,13 @@ LayoutControl1 - 17 + 16 - 412, 513 + 420, 472 - 124, 20 + 133, 20 16 @@ -536,16 +500,16 @@ LayoutControl1 - 18 + 17 - 24, 602 + 24, 561 Read Only - 508, 18 + 525, 18 17 @@ -560,16 +524,16 @@ LayoutControl1 - 19 + 18 - 24, 624 + 24, 583 Lade Indexdaten - 508, 18 + 525, 18 18 @@ -584,16 +548,16 @@ LayoutControl1 - 20 + 19 - 24, 578 + 24, 537 Muss ausgefüllt werden - 252, 18 + 260, 18 19 @@ -608,16 +572,16 @@ LayoutControl1 - 21 + 20 - 24, 646 + 24, 605 Erweitertes Auswahl Control (für lange Listen) - 508, 18 + 525, 18 20 @@ -632,13 +596,13 @@ LayoutControl1 - 22 + 21 - 144, 433 + 144, 392 - 392, 20 + 409, 20 21 @@ -653,19 +617,19 @@ LayoutControl1 - 23 + 22 0 - 412, 140 + 420, 140 Combo - 124, 20 + 133, 20 22 @@ -680,10 +644,10 @@ LayoutControl1 - 24 + 23 - 404, 578 + 412, 537 Combo @@ -692,7 +656,7 @@ - 128, 20 + 137, 20 23 @@ -707,10 +671,10 @@ LayoutControl1 - 25 + 24 - 144, 221 + 144, 180 Combo @@ -719,7 +683,7 @@ - 392, 20 + 409, 20 27 @@ -734,7 +698,7 @@ LayoutControl1 - 26 + 25 Fill @@ -787,12 +751,6 @@ Reihenfolge - - Typ: - - - Typ: - Caption Auswahldialog: @@ -1030,12 +988,6 @@ DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - LayoutControlItem22 - - - DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - LayoutControlItem23 diff --git a/app/TaskFlow/frmColumn_Detail.vb b/app/TaskFlow/frmColumn_Detail.vb index fc83be5..1f0d05d 100644 --- a/app/TaskFlow/frmColumn_Detail.vb +++ b/app/TaskFlow/frmColumn_Detail.vb @@ -85,7 +85,7 @@ Public Class frmColumn_Detail SEQUENCETextBox.Text, ADVANCED_LOOKUPCheckbox.Checked, SUMMARY_FUNCTIONCombobox.EditValue, - TYPE_COLUMNComboBox.Text, + TYPE_COLUMNComboBox2.EditValue, LU_CAPTIONTextBox.Text, GUIDTextBox.Text ) diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 27244f5..d4b278f 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -1200,11 +1200,11 @@ Public Class frmValidator End Sub Public Sub OnTextBoxFocus(sender As Object, e As EventArgs) - Dim box As TextBox = sender + Dim oTextbox As TextBox = sender - If DirectCast(box.Tag, ClassControlCreator.ControlMetadata).ReadOnly = False Then - box.BackColor = Color.LightSteelBlue - box.SelectAll() + If DirectCast(oTextbox.Tag, ClassControlCreator.ControlMetadata).ReadOnly = False Then + oTextbox.BackColor = Color.LightSteelBlue + oTextbox.SelectAll() End If End Sub