diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index c42559f..04baf47 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -63,14 +63,14 @@ Partial Class frmFormDesigner Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() - Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() Me.GroupBox1.SuspendLayout() Me.pnldesigner.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() @@ -106,7 +106,7 @@ Partial Class frmFormDesigner Me.GroupBox1.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.GroupBox1.Name = "GroupBox1" Me.GroupBox1.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.GroupBox1.Size = New System.Drawing.Size(381, 137) + Me.GroupBox1.Size = New System.Drawing.Size(381, 111) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -116,10 +116,10 @@ Partial Class frmFormDesigner Me.btnButton.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnButton.Image = CType(resources.GetObject("btnButton.Image"), System.Drawing.Image) Me.btnButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnButton.Location = New System.Drawing.Point(249, 18) + Me.btnButton.Location = New System.Drawing.Point(213, 15) Me.btnButton.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnButton.Name = "btnButton" - Me.btnButton.Size = New System.Drawing.Size(96, 32) + Me.btnButton.Size = New System.Drawing.Size(82, 26) Me.btnButton.TabIndex = 8 Me.btnButton.Text = "Button" Me.btnButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -130,10 +130,10 @@ Partial Class frmFormDesigner Me.btnLine.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnLine.Image = CType(resources.GetObject("btnLine.Image"), System.Drawing.Image) Me.btnLine.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnLine.Location = New System.Drawing.Point(249, 93) + Me.btnLine.Location = New System.Drawing.Point(213, 76) Me.btnLine.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnLine.Name = "btnLine" - Me.btnLine.Size = New System.Drawing.Size(96, 34) + Me.btnLine.Size = New System.Drawing.Size(82, 28) Me.btnLine.TabIndex = 7 Me.btnLine.Text = "Linie" Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -144,10 +144,10 @@ Partial Class frmFormDesigner Me.btnTabelle.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnTabelle.Image = Global.DD_ProcessManager.My.Resources.Resources.table_add Me.btnTabelle.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnTabelle.Location = New System.Drawing.Point(129, 18) + Me.btnTabelle.Location = New System.Drawing.Point(111, 15) Me.btnTabelle.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnTabelle.Name = "btnTabelle" - Me.btnTabelle.Size = New System.Drawing.Size(114, 32) + Me.btnTabelle.Size = New System.Drawing.Size(98, 26) Me.btnTabelle.TabIndex = 6 Me.btnTabelle.Text = "Tabelle" Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -158,10 +158,10 @@ Partial Class frmFormDesigner Me.btnCheckbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnCheckbox.Image = Global.DD_ProcessManager.My.Resources.Resources.checkbox_16xLG Me.btnCheckbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnCheckbox.Location = New System.Drawing.Point(129, 93) + Me.btnCheckbox.Location = New System.Drawing.Point(111, 76) Me.btnCheckbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnCheckbox.Name = "btnCheckbox" - Me.btnCheckbox.Size = New System.Drawing.Size(114, 34) + Me.btnCheckbox.Size = New System.Drawing.Size(98, 28) Me.btnCheckbox.TabIndex = 5 Me.btnCheckbox.Text = "Checkbox" Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -172,10 +172,10 @@ Partial Class frmFormDesigner Me.btnVektor.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnVektor.Image = Global.DD_ProcessManager.My.Resources.Resources.ComboBox_16xLG Me.btnVektor.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnVektor.Location = New System.Drawing.Point(10, 93) + Me.btnVektor.Location = New System.Drawing.Point(9, 76) Me.btnVektor.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnVektor.Name = "btnVektor" - Me.btnVektor.Size = New System.Drawing.Size(114, 34) + Me.btnVektor.Size = New System.Drawing.Size(98, 28) Me.btnVektor.TabIndex = 4 Me.btnVektor.Text = "LookupControl" Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -186,10 +186,10 @@ Partial Class frmFormDesigner Me.btndtp.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btndtp.Image = Global.DD_ProcessManager.My.Resources.Resources.DateOrTimePicker_675 Me.btndtp.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btndtp.Location = New System.Drawing.Point(130, 54) + Me.btndtp.Location = New System.Drawing.Point(111, 44) Me.btndtp.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btndtp.Name = "btndtp" - Me.btndtp.Size = New System.Drawing.Size(114, 35) + Me.btndtp.Size = New System.Drawing.Size(98, 28) Me.btndtp.TabIndex = 3 Me.btndtp.Text = "DatePicker" Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -200,10 +200,10 @@ Partial Class frmFormDesigner Me.btntextbox.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btntextbox.Image = Global.DD_ProcessManager.My.Resources.Resources.TextBox_708 Me.btntextbox.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btntextbox.Location = New System.Drawing.Point(10, 54) + Me.btntextbox.Location = New System.Drawing.Point(9, 44) Me.btntextbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btntextbox.Name = "btntextbox" - Me.btntextbox.Size = New System.Drawing.Size(114, 35) + Me.btntextbox.Size = New System.Drawing.Size(98, 28) Me.btntextbox.TabIndex = 1 Me.btntextbox.Text = "Textbox" Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -214,10 +214,10 @@ Partial Class frmFormDesigner Me.btnlabel.Font = New System.Drawing.Font("Segoe UI", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnlabel.Image = Global.DD_ProcessManager.My.Resources.Resources.Label_684 Me.btnlabel.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnlabel.Location = New System.Drawing.Point(10, 18) + Me.btnlabel.Location = New System.Drawing.Point(9, 15) Me.btnlabel.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnlabel.Name = "btnlabel" - Me.btnlabel.Size = New System.Drawing.Size(113, 32) + Me.btnlabel.Size = New System.Drawing.Size(97, 26) Me.btnlabel.TabIndex = 0 Me.btnlabel.Text = "Label" Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -244,7 +244,7 @@ Partial Class frmFormDesigner ' Me.Label1.AutoSize = True Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.Label1.Location = New System.Drawing.Point(80, 120) + Me.Label1.Location = New System.Drawing.Point(70, 100) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(347, 16) Me.Label1.TabIndex = 6 @@ -255,7 +255,7 @@ Partial Class frmFormDesigner Me.lblhintergrund.AutoSize = True Me.lblhintergrund.Font = New System.Drawing.Font("Tahoma", 18.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.lblhintergrund.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.lblhintergrund.Location = New System.Drawing.Point(80, 90) + Me.lblhintergrund.Location = New System.Drawing.Point(70, 70) Me.lblhintergrund.Name = "lblhintergrund" Me.lblhintergrund.Size = New System.Drawing.Size(248, 29) Me.lblhintergrund.TabIndex = 1 @@ -269,11 +269,11 @@ Partial Class frmFormDesigner Me.TabControlEigenschaften.Controls.Add(Me.pageProperties) Me.TabControlEigenschaften.Controls.Add(Me.pageFormat) Me.TabControlEigenschaften.Enabled = False - Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 141) + Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 115) Me.TabControlEigenschaften.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.TabControlEigenschaften.Name = "TabControlEigenschaften" Me.TabControlEigenschaften.SelectedIndex = 0 - Me.TabControlEigenschaften.Size = New System.Drawing.Size(372, 340) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(373, 367) Me.TabControlEigenschaften.TabIndex = 22 ' 'pageProperties @@ -283,7 +283,7 @@ Partial Class frmFormDesigner Me.pageProperties.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageProperties.Name = "pageProperties" Me.pageProperties.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.pageProperties.Size = New System.Drawing.Size(364, 311) + Me.pageProperties.Size = New System.Drawing.Size(365, 338) Me.pageProperties.TabIndex = 3 Me.pageProperties.Text = "Eigenschaften" Me.pageProperties.UseVisualStyleBackColor = True @@ -295,7 +295,7 @@ Partial Class frmFormDesigner Me.pgControls.Location = New System.Drawing.Point(3, 2) Me.pgControls.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pgControls.Name = "pgControls" - Me.pgControls.Size = New System.Drawing.Size(358, 307) + Me.pgControls.Size = New System.Drawing.Size(359, 334) Me.pgControls.TabIndex = 0 ' 'pageFormat @@ -307,11 +307,11 @@ Partial Class frmFormDesigner Me.pageFormat.Controls.Add(Me.btnwidth_minus) Me.pageFormat.Controls.Add(Me.btnwidth_plus) Me.pageFormat.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.pageFormat.Location = New System.Drawing.Point(4, 25) + Me.pageFormat.Location = New System.Drawing.Point(4, 22) Me.pageFormat.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.pageFormat.Name = "pageFormat" Me.pageFormat.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) - Me.pageFormat.Size = New System.Drawing.Size(364, 311) + Me.pageFormat.Size = New System.Drawing.Size(311, 250) Me.pageFormat.TabIndex = 1 Me.pageFormat.Text = "Format" Me.pageFormat.UseVisualStyleBackColor = True @@ -321,10 +321,10 @@ Partial Class frmFormDesigner Me.btnheight_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnheight_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_minus.Location = New System.Drawing.Point(93, 67) + Me.btnheight_minus.Location = New System.Drawing.Point(80, 54) Me.btnheight_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_minus.Name = "btnheight_minus" - Me.btnheight_minus.Size = New System.Drawing.Size(76, 33) + Me.btnheight_minus.Size = New System.Drawing.Size(65, 27) Me.btnheight_minus.TabIndex = 1 Me.btnheight_minus.Text = "kleiner" Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -335,10 +335,10 @@ Partial Class frmFormDesigner Me.btnheight_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnheight_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnheight_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnheight_plus.Location = New System.Drawing.Point(12, 67) + Me.btnheight_plus.Location = New System.Drawing.Point(10, 54) Me.btnheight_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnheight_plus.Name = "btnheight_plus" - Me.btnheight_plus.Size = New System.Drawing.Size(75, 33) + Me.btnheight_plus.Size = New System.Drawing.Size(64, 27) Me.btnheight_plus.TabIndex = 0 Me.btnheight_plus.Text = "größer" Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -347,7 +347,7 @@ Partial Class frmFormDesigner 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(9, 49) + Me.Label3.Location = New System.Drawing.Point(8, 40) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 16) Me.Label3.TabIndex = 5 @@ -356,7 +356,7 @@ Partial Class frmFormDesigner 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(9, 2) + Me.Label2.Location = New System.Drawing.Point(8, 2) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(46, 16) Me.Label2.TabIndex = 4 @@ -367,10 +367,10 @@ Partial Class frmFormDesigner Me.btnwidth_minus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_minus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_out Me.btnwidth_minus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_minus.Location = New System.Drawing.Point(93, 18) + Me.btnwidth_minus.Location = New System.Drawing.Point(80, 15) Me.btnwidth_minus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_minus.Name = "btnwidth_minus" - Me.btnwidth_minus.Size = New System.Drawing.Size(76, 29) + Me.btnwidth_minus.Size = New System.Drawing.Size(65, 24) Me.btnwidth_minus.TabIndex = 1 Me.btnwidth_minus.Text = "kleiner" Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -381,10 +381,10 @@ Partial Class frmFormDesigner Me.btnwidth_plus.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.btnwidth_plus.Image = Global.DD_ProcessManager.My.Resources.Resources.zoom_in Me.btnwidth_plus.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnwidth_plus.Location = New System.Drawing.Point(11, 18) + Me.btnwidth_plus.Location = New System.Drawing.Point(9, 15) Me.btnwidth_plus.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnwidth_plus.Name = "btnwidth_plus" - Me.btnwidth_plus.Size = New System.Drawing.Size(76, 29) + Me.btnwidth_plus.Size = New System.Drawing.Size(65, 24) Me.btnwidth_plus.TabIndex = 0 Me.btnwidth_plus.Text = "größer" Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -505,24 +505,45 @@ Partial Class frmFormDesigner Me.RibbonControl1.Size = New System.Drawing.Size(1227, 146) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Button Abschluss CheckSQL" + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Lösche Control" + Me.BarButtonItem2.Id = 2 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Aktualisieren" + Me.BarButtonItem3.Id = 3 + Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) Me.RibbonPage1.Name = "RibbonPage1" - Me.RibbonPage1.Text = "RibbonPage1" + Me.RibbonPage1.Text = "Funktionen" ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - Me.RibbonPageGroup1.Text = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Aktionen" ' 'RibbonPageGroup2 ' Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - Me.RibbonPageGroup2.Text = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Control Aktionen" ' 'RibbonStatusBar1 ' @@ -536,25 +557,6 @@ Partial Class frmFormDesigner Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' - 'BarButtonItem1 - ' - Me.BarButtonItem1.Caption = "Button Abschluss CheckSQL" - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" - ' - 'BarButtonItem2 - ' - Me.BarButtonItem2.Caption = "BarButtonItem2" - Me.BarButtonItem2.Id = 2 - Me.BarButtonItem2.Name = "BarButtonItem2" - ' - 'BarButtonItem3 - ' - Me.BarButtonItem3.Caption = "BarButtonItem3" - Me.BarButtonItem3.Id = 3 - Me.BarButtonItem3.Name = "BarButtonItem3" - ' 'frmFormDesigner ' Me.Appearance.Options.UseFont = True diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx index 672d396..2aa0895 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.resx +++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx @@ -140,6 +140,9 @@ 206, 17 + + 206, 17 + 17, 56 @@ -196,6 +199,50 @@ dyIgLz4NCiAgICA8cGF0aCBkPSJNMjMsMTRjLTUsMC05LDQtOSw5YzAsNSw0LDksOSw5czktNCw5LTlD MzIsMTgsMjgsMTQsMjMsMTR6IE0yMiwyOGwtNS01bDItMmwzLDNsNS01bDIsMkwyMiwyOHoiIGNsYXNz PSJHcmVlbiIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAD0DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs + YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy + Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRGVsZXRlIj4N + CiAgICA8Zz4NCiAgICAgIDxwYXRoIGQ9Ik0xOC44LDE2bDYuOS02LjljMC40LTAuNCwwLjQtMSwwLTEu + NGwtMS40LTEuNGMtMC40LTAuNC0xLTAuNC0xLjQsMEwxNiwxMy4yTDkuMSw2LjNjLTAuNC0wLjQtMS0w + LjQtMS40LDAgICAgTDYuMyw3LjdjLTAuNCwwLjQtMC40LDEsMCwxLjRsNi45LDYuOWwtNi45LDYuOWMt + MC40LDAuNC0wLjQsMSwwLDEuNGwxLjQsMS40YzAuNCwwLjQsMSwwLjQsMS40LDBsNi45LTYuOWw2Ljks + Ni45ICAgIGMwLjQsMC40LDEsMC40LDEuNCwwbDEuNC0xLjRjMC40LTAuNCwwLjQtMSwwLTEuNEwxOC44 + LDE2eiIgY2xhc3M9IlJlZCIgLz4NCiAgICA8L2c+DQogIDwvZz4NCjwvc3ZnPgs= + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIkDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ2hhbmdlVmlldyI+DQogICAgPHBh + dGggZD0iTTI0LjUsNy41QzIyLjMsNS4zLDE5LjMsNCwxNiw0QzEwLjEsNCw1LjEsOC4zLDQuMiwxNGg0 + LjFjMC45LTMuNCw0LTYsNy43LTZjMi4yLDAsNC4yLDAuOSw1LjYsMi40TDE4LDE0ICAgaDUuN2g0LjFI + MjhWNEwyNC41LDcuNXogTTE2LDI0Yy0yLjIsMC00LjItMC45LTUuNi0yLjRMMTQsMThIOC4yaC00SDR2 + MTBsMy41LTMuNUM5LjcsMjYuNywxMi43LDI4LDE2LDI4YzUuOSwwLDEwLjgtNC4zLDExLjgtMTAgICBo + LTQuMUMyMi44LDIxLjQsMTkuNywyNCwxNiwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2 + Zz4L diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index b3352d7..74c9c0a 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -339,7 +339,7 @@ Public Class frmFormDesigner .Guid = GetLastID(), .ReadOnly = False } - + CHANGES_IN_ADMINISTRATION = True pnldesigner.Controls.Add(label) @@ -348,7 +348,7 @@ Public Class frmFormDesigner SetMovementHandlers(txt) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, txt.Name, "TXT", txt.Name, txt.Location.X, txt.Location.Y, USER_USERNAME, txt.Size.Height, txt.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = txt CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -362,7 +362,7 @@ Public Class frmFormDesigner SetMovementHandlers(cmb) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, cmb.Name, "CMB", cmb.Name, cmb.Location.X, cmb.Location.Y, USER_USERNAME, cmb.Size.Height, cmb.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = cmb CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -376,7 +376,7 @@ Public Class frmFormDesigner SetMovementHandlers(dtp) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, dtp.Name, "DTP", dtp.Name, dtp.Location.X, dtp.Location.Y, USER_USERNAME, dtp.Size.Height, dtp.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = dtp CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -390,7 +390,7 @@ Public Class frmFormDesigner SetMovementHandlers(chk) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, chk.Name, "CHK", chk.Text, chk.Location.X, chk.Location.Y, USER_USERNAME, chk.Size.Height, chk.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = chk CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -405,7 +405,7 @@ Public Class frmFormDesigner SetMovementHandlers(lc) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, lc.Name, "LOOKUP", lc.Name, lc.Location.X, lc.Location.Y, USER_USERNAME, lc.Size.Height, lc.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = lc CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -421,7 +421,7 @@ Public Class frmFormDesigner AddHandler tb.MouseClick, AddressOf gridControl_MouseClick TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, tb.Name, "TABLE", tb.Name, tb.Location.X, tb.Location.Y, USER_USERNAME, tb.Size.Height, tb.Size.Width) - + CHANGES_IN_ADMINISTRATION = True Dim oControlId = GetLastID() CurrentControl = tb @@ -440,7 +440,7 @@ Public Class frmFormDesigner SetMovementHandlers(line) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, line.Name, "LINE", line.Name, line.Location.X, line.Location.Y, USER_USERNAME, line.Size.Height, line.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = line CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -455,7 +455,7 @@ Public Class frmFormDesigner SetMovementHandlers(oButton) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, oButton.Name, "BUTTON", oButton.Name, oButton.Location.X, oButton.Location.Y, USER_USERNAME, oButton.Size.Height, oButton.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = oButton CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -592,6 +592,7 @@ Public Class frmFormDesigner If CurrentControl Is Nothing = False Then CurrentControl.Size = New Size(CurrentControl.Width + 5, CurrentControl.Height) UpdateSingleValue("WIDTH", CurrentControl.Size.Width) + End If End Sub @@ -606,6 +607,7 @@ Public Class frmFormDesigner CurrentControl.Size = New Size(newWidth, CurrentControl.Height) UpdateSingleValue("WIDTH", CurrentControl.Size.Width) + End If End Sub @@ -1020,10 +1022,16 @@ Public Class frmFormDesigner Case "Enable_SQL" UpdateSingleValue("SQL_ENABLE", newValue) + UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID) + UpdateSingleValue("CHOICE_LIST", "") Case "Override_SQL" UpdateSingleValue("SQL2", newValue) + UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID) + UpdateSingleValue("CHOICE_LIST", "") Case "SetControlData" UpdateSingleValue("SET_CONTROL_DATA", newValue) + UpdateSingleValue("CONNECTION_ID", CURRENT_CONN_ID) + UpdateSingleValue("CHOICE_LIST", "") Case "ChoiceList" UpdateSingleValue("CHOICE_LIST", newValue) UpdateSingleValue("SQL_UEBERPRUEFUNG", "") @@ -1050,6 +1058,7 @@ Public Class frmFormDesigner Dim myPath As ImageValue = newValue UpdateImage(myPath.Value) End Select + CHANGES_IN_ADMINISTRATION = True End Sub Private Function UpdateImage(ImageLocation As String) Try @@ -1069,6 +1078,7 @@ Public Class frmFormDesigner tslblAenderungen.Visible = True tslblAenderungen.Text = "Änderungen gespeichert - " & Now + CHANGES_IN_ADMINISTRATION = True Return True Catch ex As Exception @@ -1099,6 +1109,7 @@ Public Class frmFormDesigner Dim oSQL = $"EXEC PRPM_CHANGE_CONTROL_CAPTION {guid},{escapedValue},'{USER_USERNAME}','{USER_LANGUAGE}'" ClassDatabase.Execute_non_Query(oSQL) End If + CHANGES_IN_ADMINISTRATION = True Return True End If @@ -1132,6 +1143,40 @@ Public Class frmFormDesigner End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Try + CURRENT_DESIGN_TYPE = "SQL_BTNFINISH" + Dim oSQL = $"SELECT SQL_BTN_FINISH FROM TBPM_PROFILE WHERE GUID = {ProfileId}" + Dim oldSQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) + Dim oForm As New frmSQL_DESIGNER() With {.SQLCommand = oldSQL} + Dim oResult = oForm.ShowDialog() + If oResult = DialogResult.OK Then + If oldSQL <> oForm.SQLCommand Then + Dim oUpdate As String = $"Update TBPM_PROFILE SET CHANGED_WHO = '{USER_USERNAME}', SQL_BTN_FINISH = '{oForm.SQLCommand.Replace("'", "''")}' WHERE GUID = {CURRENT_ProfilGUID}" + If ClassDatabase.Execute_non_Query(oUpdate) = True Then + tslblAenderungen.Text = $"Profile SQLFinish saved - {Now.ToLongTimeString}" + tslblAenderungen.Visible = True + CHANGES_IN_ADMINISTRATION = True + Else + tslblAenderungen.Visible = False + End If + + End If + End If + Catch ex As Exception + MsgBox("Error in Saving Profile SQLFinish: " & vbNewLine & vbNewLine & ex.Message) + LOGGER.Error(ex) + End Try + End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + If CurrentControl Is Nothing = False Then + DeleteControl(CurrentControl.Name) + TabControlEigenschaften.Enabled = False + End If + End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + LoadControls() End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index e1f8fbc..c75cd08 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -831,7 +831,15 @@ Public Class frmMain Dim oExpression = $"GUID = {CURRENT_ProfilGUID}" CURRENT_DT_PROFILE.Clear() - CURRENT_DT_PROFILES.Select(oExpression).CopyToDataTable(CURRENT_DT_PROFILE, LoadOption.PreserveChanges) + If CHANGES_IN_ADMINISTRATION = True Then + CURRENT_DT_PROFILES = ClassDatabase.Return_Datatable("select * from TBPM_PROFILE where ACTIVE = 1") + Dim oSQL = $"SELECT * FROM VWPM_CONTROL_INDEX ORDER BY PROFIL_ID,Y_LOC, X_LOC" + DTVWCONTROLS_INDEX = ClassDatabase.Return_Datatable(oSQL) + CHANGES_IN_ADMINISTRATION = False + Else + CURRENT_DT_PROFILES.Select(oExpression).CopyToDataTable(CURRENT_DT_PROFILE, LoadOption.PreserveChanges) + End If + If CURRENT_DT_PROFILE.Rows.Count = 1 Then CURRENT_ProfilName = CURRENT_DT_PROFILE.Rows(0).Item("NAME") Else diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 59a0d3d..e44fe53 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -231,7 +231,7 @@ Public Class frmValidator End If LOGGER.Debug("Right_Delete: " & USER_RIGHT_FILE_DELETE.ToString) Create_Controls() - + Controls2beDisabled End If End If @@ -244,6 +244,26 @@ Public Class frmValidator End Try End Sub + Private Sub Controls2beDisabled() + Try + Dim oFilteredDatatable As DataTable = DTCONTROLS.Clone() + Dim oExpression = $"LEN(SQL_ENABLE) > 0'" + DTCONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges) + If oFilteredDatatable.Rows.Count > 0 Then + LOGGER.Debug($"We got {oFilteredDatatable.Rows.Count} controls which need to be disabled!!") + End If + For Each oRowEnablingControl As DataRow In oFilteredDatatable.Rows + Dim oENABLE_GUID = oRowEnablingControl.Item("GUID") + Dim oENABLE_CtrlName = oRowEnablingControl.Item("NAME") + For Each oControl As Control In pnldesigner.Controls + oControl.Enabled = False + Exit For + Next + Next + Catch ex As Exception + LOGGER.Error(ex) + End Try + End Sub Private Sub frmValidation_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing Try me_closing = True @@ -1287,6 +1307,7 @@ Public Class frmValidator If Not IsNothing(SelectedValues) Then If SelectedValues.Count = 1 Then LookupControl_DependingControls(oLookup, SelectedValues) + LookupControl_EnablingControls(oLookup, SelectedValues) LookupControl_DependingColumn(oLookup, SelectedValues) Else LOGGER.Debug("Uups: SelectedValues.Count <> 1 ") @@ -1296,6 +1317,69 @@ Public Class frmValidator LOGGER.Error(ex) End Try End Sub + Private Sub LookupControl_EnablingControls(LookupControl As LookupControl2, SelectedValues As List(Of String)) + Dim oLOOKUPValue = SelectedValues.Item(0) + LOGGER.Debug($"oLOOKUPValue is [{oLOOKUPValue}]!") + Dim oControlID = DirectCast(LookupControl.Tag, ClassControlCreator.ControlMetadata).Guid + Controls2beEnabled(LookupControl.Name) + + End Sub + + Private Sub Controls2beEnabled(pControlName As String) + Try + Dim oFilteredDatatable As DataTable = DTCONTROLS.Clone() + Dim oExpression = $"SQL_ENABLE like '%#CTRL#{pControlName}%'" + DTCONTROLS.Select(oExpression).CopyToDataTable(oFilteredDatatable, LoadOption.PreserveChanges) + If oFilteredDatatable.Rows.Count > 0 Then + LOGGER.Debug($"We got {oFilteredDatatable.Rows.Count} controls which got enable definitions!!") + Else + LOGGER.Debug($"Sorry NO controls with enabling definition!!") + End If + For Each oRowEnablingControl As DataRow In oFilteredDatatable.Rows + Dim oENABLE_GUID = oRowEnablingControl.Item("GUID") + Dim oENABLE_CtrlName = oRowEnablingControl.Item("NAME") + LOGGER.Debug($"Control {oENABLE_CtrlName} is depending on lookUp {pControlName}..") + If _dependingControl_in_action = True Then + LOGGER.Debug($"..but _dependingControl_in_action = True ==> Exit Sub!") + Exit Sub + End If + If Not IsDBNull(oRowEnablingControl.Item("CONNECTION_ID")) And Not IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")) Then + Dim oSqlCommand = IIf(IsDBNull(oRowEnablingControl.Item("SQL_ENABLE")), "", oRowEnablingControl.Item("SQL_ENABLE")) + oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) + _dependingControl_in_action = True + Dim oENABLERESULT As Boolean = ClassDatabase.Execute_Scalar(oSqlCommand, CONNECTION_STRING) + Try + Dim oFound As Boolean = False + 'Dim oDependingLookup As LookupControl2 = pnldesigner.Controls.Find(oDEPENDING_CtrlName, False).FirstOrDefault() + For Each oControl As Control In pnldesigner.Controls + If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oENABLE_GUID Then + oFound = True + LOGGER.Debug($"Got the depending control ID:{oENABLE_GUID}..Setting enabled/Disabled...") + oControl.Enabled = oENABLERESULT + _dependingControl_in_action = False + Exit For + End If + + Next + + If oFound = False Then + LOGGER.Debug($"Could not find the enabling Control with ID {oENABLE_GUID} on panel!!!") + End If + Catch ex As Exception + LOGGER.Warn($"Error while setting enabling control-value for [{oENABLE_CtrlName}]: " & ex.Message) + _dependingControl_in_action = False + End Try + Else + LOGGER.Debug($"Error: Check CoNN ID and SQL on NULL VALUES!") + End If + Next + + + + Catch ex As Exception + LOGGER.Error(ex) + End Try + End Sub Public Sub onLookUpselectedValue_Control2Set(sender As Object, SelectedValues As List(Of String)) LOGGER.Debug("onLookUpselectedValue_Control2Set") If FormLoaded = False Then @@ -1590,36 +1674,6 @@ Public Class frmValidator sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) _Step = 3 - '' Regulären Ausdruck zum Auslesen der Indexe definieren - 'Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}" - '' einen Regulären Ausdruck laden - 'Dim regulärerAusdruck As Text.RegularExpressions.Regex = New Text.RegularExpressions.Regex(preg) - '' die Vorkommen im SQL-String auslesen - 'Dim elemente As Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(sql_Statement) - ''#### - '' alle Vorkommen innerhalbd er Namenkonvention durchlaufen - 'For Each element As Text.RegularExpressions.Match In elemente - ' Try - ' If LogErrorsOnly = False Then LOGGER.Info(" >> element in RegeX: " & element.Value) - ' Dim MyPattern = element.Value.Substring(2, element.Value.Length - 3) - ' Dim input_value - - ' If MyPattern.Contains(ClassControlCreator.PREFIX_TEXTBOX) Then - ' Dim txt As TextBox = CType(pnldesigner.Controls(MyPattern), TextBox) - ' input_value = txt.Text - ' ElseIf MyPattern.Contains(ClassControlCreator.PREFIX_COMBOBOX) Then - ' Dim cmb1 As ComboBox = CType(pnldesigner.Controls(MyPattern), ComboBox) - ' input_value = cmb1.Text - ' End If - ' sql_Statement = sql_Statement.ToString.Replace(element.Value, input_value) - - ' Catch ex As Exception - ' LOGGER.Info("Unexpected Error in Checking control values for Variable SQL Result ComboBox - ERROR: " & ex.Message) - ' End Try - - 'Next - 'If LogErrorsOnly = False Then LOGGER.Info(">>> sql_Statement after replacement: " & sql_Statement) - _dependingControl_in_action = True _Step = 4 Depending_Control_Set_Result(displayboxname, sql_Statement, ROW.Item(1)) @@ -1633,15 +1687,13 @@ Public Class frmValidator End Try Next End If + Controls2beEnabled(cmb.Name) Catch ex As Exception LOGGER.Error(ex) LOGGER.Info("Unexpected Error in Eventhandler Variable SQL Result ComboBox - ERROR: " & ex.Message) End Try - - SendKeys.Send("{TAB}") ControlHandleStarted = True - End If End If End Sub