From 8a9a1d409e32c71f8c09db8a358de3535fa30a00 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Tue, 17 Mar 2020 14:44:03 +0100 Subject: [PATCH] MS --- app/DD_PM_WINDREAM/ModuleControlProperties.vb | 1 + app/DD_PM_WINDREAM/frmAdministration.resx | 2 +- .../frmFormDesigner.Designer.vb | 314 +++++++++++------- app/DD_PM_WINDREAM/frmFormDesigner.resx | 76 ++++- app/DD_PM_WINDREAM/frmFormDesigner.vb | 73 +++- app/DD_PM_WINDREAM/frmValidator.vb | 105 ++++-- 6 files changed, 392 insertions(+), 179 deletions(-) diff --git a/app/DD_PM_WINDREAM/ModuleControlProperties.vb b/app/DD_PM_WINDREAM/ModuleControlProperties.vb index f456fee..6fe9c4b 100644 --- a/app/DD_PM_WINDREAM/ModuleControlProperties.vb +++ b/app/DD_PM_WINDREAM/ModuleControlProperties.vb @@ -247,6 +247,7 @@ Public Module ModuleControlProperties Public Property DisplayAsComboBox As Boolean Public Property SetControlData As SQLValue + End Class Public Class LineLabelProperties diff --git a/app/DD_PM_WINDREAM/frmAdministration.resx b/app/DD_PM_WINDREAM/frmAdministration.resx index 98ec8a1..1be61f2 100644 --- a/app/DD_PM_WINDREAM/frmAdministration.resx +++ b/app/DD_PM_WINDREAM/frmAdministration.resx @@ -3423,7 +3423,7 @@ - SQL Abschluss + Button Abschluss CheckSQL diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index 8442184..7164d4a 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -1,6 +1,6 @@  Partial Class frmFormDesigner - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -33,9 +33,6 @@ Partial Class frmFormDesigner Me.btndtp = New System.Windows.Forms.Button() Me.btntextbox = New System.Windows.Forms.Button() Me.btnlabel = New System.Windows.Forms.Button() - Me.pnldesigner = New DD_ProcessManager.ClassSnapPanel() - Me.Label1 = New System.Windows.Forms.Label() - Me.lblhintergrund = New System.Windows.Forms.Label() Me.TabControlEigenschaften = New System.Windows.Forms.TabControl() Me.pageProperties = New System.Windows.Forms.TabPage() Me.pgControls = New System.Windows.Forms.PropertyGrid() @@ -49,11 +46,9 @@ Partial Class frmFormDesigner Me.TBPM_PROFILE_CONTROLSBindingSource = New System.Windows.Forms.BindingSource(Me.components) Me.DD_DMSLiteDataSet = New DD_ProcessManager.DD_DMSLiteDataSet() Me.TBDD_CONNECTIONBindingSource = New System.Windows.Forms.BindingSource(Me.components) - Me.btndelete = New System.Windows.Forms.Button() Me.StatusStrip1 = New System.Windows.Forms.StatusStrip() Me.tslblAenderungen = New System.Windows.Forms.ToolStripStatusLabel() Me.ToolTip1 = New System.Windows.Forms.ToolTip(Me.components) - Me.btnrefresh = New System.Windows.Forms.Button() Me.TBPM_PROFILE_CONTROLSTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_CONTROLSTableAdapter() Me.TableAdapterManager = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TableAdapterManager() Me.TBDD_CONNECTIONTableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBDD_CONNECTIONTableAdapter() @@ -64,8 +59,19 @@ Partial Class frmFormDesigner Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem() Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.pnldesigner = New DD_ProcessManager.ClassSnapPanel() + Me.Label1 = New System.Windows.Forms.Label() + Me.lblhintergrund = New System.Windows.Forms.Label() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.bbtnItemFinishSQL = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem2 = 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.GroupBox1.SuspendLayout() - Me.pnldesigner.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() Me.pageProperties.SuspendLayout() Me.pageFormat.SuspendLayout() @@ -80,12 +86,12 @@ Partial Class frmFormDesigner Me.SplitContainer1.Panel1.SuspendLayout() Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() + Me.pnldesigner.SuspendLayout() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'GroupBox1 ' - Me.GroupBox1.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.GroupBox1.Controls.Add(Me.btnButton) Me.GroupBox1.Controls.Add(Me.btnLine) Me.GroupBox1.Controls.Add(Me.btnTabelle) @@ -95,9 +101,11 @@ Partial Class frmFormDesigner Me.GroupBox1.Controls.Add(Me.btntextbox) Me.GroupBox1.Controls.Add(Me.btnlabel) Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.GroupBox1.Location = New System.Drawing.Point(7, 9) + Me.GroupBox1.Location = New System.Drawing.Point(3, 3) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(363, 129) + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.GroupBox1.Size = New System.Drawing.Size(371, 125) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -107,9 +115,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(290, 22) + Me.btnButton.Location = New System.Drawing.Point(217, 20) + Me.btnButton.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnButton.Name = "btnButton" - Me.btnButton.Size = New System.Drawing.Size(112, 27) + Me.btnButton.Size = New System.Drawing.Size(99, 28) Me.btnButton.TabIndex = 8 Me.btnButton.Text = "Button" Me.btnButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -120,9 +129,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(290, 90) + Me.btnLine.Location = New System.Drawing.Point(217, 82) + Me.btnLine.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnLine.Name = "btnLine" - Me.btnLine.Size = New System.Drawing.Size(112, 27) + Me.btnLine.Size = New System.Drawing.Size(99, 28) Me.btnLine.TabIndex = 7 Me.btnLine.Text = "Linie" Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -133,9 +143,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(151, 22) + Me.btnTabelle.Location = New System.Drawing.Point(112, 20) + Me.btnTabelle.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnTabelle.Name = "btnTabelle" - Me.btnTabelle.Size = New System.Drawing.Size(133, 27) + Me.btnTabelle.Size = New System.Drawing.Size(99, 28) Me.btnTabelle.TabIndex = 6 Me.btnTabelle.Text = "Tabelle" Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -146,9 +157,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(151, 90) + Me.btnCheckbox.Location = New System.Drawing.Point(112, 84) + Me.btnCheckbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnCheckbox.Name = "btnCheckbox" - Me.btnCheckbox.Size = New System.Drawing.Size(133, 27) + Me.btnCheckbox.Size = New System.Drawing.Size(99, 28) Me.btnCheckbox.TabIndex = 5 Me.btnCheckbox.Text = "Checkbox" Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -159,9 +171,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(13, 88) + Me.btnVektor.Location = New System.Drawing.Point(7, 84) + Me.btnVektor.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnVektor.Name = "btnVektor" - Me.btnVektor.Size = New System.Drawing.Size(133, 27) + Me.btnVektor.Size = New System.Drawing.Size(99, 28) Me.btnVektor.TabIndex = 4 Me.btnVektor.Text = "LookupControl" Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -172,9 +185,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(151, 55) + Me.btndtp.Location = New System.Drawing.Point(112, 52) + Me.btndtp.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btndtp.Name = "btndtp" - Me.btndtp.Size = New System.Drawing.Size(133, 27) + Me.btndtp.Size = New System.Drawing.Size(99, 28) Me.btndtp.TabIndex = 3 Me.btndtp.Text = "DatePicker" Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -185,9 +199,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(13, 55) + Me.btntextbox.Location = New System.Drawing.Point(7, 52) + Me.btntextbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btntextbox.Name = "btntextbox" - Me.btntextbox.Size = New System.Drawing.Size(133, 27) + Me.btntextbox.Size = New System.Drawing.Size(99, 28) Me.btntextbox.TabIndex = 1 Me.btntextbox.Text = "Textbox" Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -198,72 +213,35 @@ 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(12, 22) + Me.btnlabel.Location = New System.Drawing.Point(7, 20) + Me.btnlabel.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnlabel.Name = "btnlabel" - Me.btnlabel.Size = New System.Drawing.Size(133, 27) + Me.btnlabel.Size = New System.Drawing.Size(99, 28) Me.btnlabel.TabIndex = 0 Me.btnlabel.Text = "Label" Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight Me.btnlabel.UseVisualStyleBackColor = True ' - 'pnldesigner - ' - Me.pnldesigner.AllowDrop = True - Me.pnldesigner.AutoScroll = True - Me.pnldesigner.BackColor = System.Drawing.Color.Transparent - Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle - Me.pnldesigner.Controls.Add(Me.Label1) - Me.pnldesigner.Controls.Add(Me.lblhintergrund) - Me.pnldesigner.Dock = System.Windows.Forms.DockStyle.Fill - Me.pnldesigner.GridSize = 10 - Me.pnldesigner.Location = New System.Drawing.Point(0, 0) - Me.pnldesigner.Name = "pnldesigner" - Me.pnldesigner.ShowGrid = True - Me.pnldesigner.Size = New System.Drawing.Size(842, 650) - Me.pnldesigner.TabIndex = 3 - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.Label1.Location = New System.Drawing.Point(91, 150) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(347, 16) - Me.Label1.TabIndex = 6 - Me.Label1.Text = "Gestalten sie in diesem Bereich Ihre Validierungsoberfläche" - ' - 'lblhintergrund - ' - 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(89, 111) - Me.lblhintergrund.Name = "lblhintergrund" - Me.lblhintergrund.Size = New System.Drawing.Size(248, 29) - Me.lblhintergrund.TabIndex = 1 - Me.lblhintergrund.Text = "Validierungsbereich" - ' 'TabControlEigenschaften ' - Me.TabControlEigenschaften.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ - Or System.Windows.Forms.AnchorStyles.Left) _ - Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) Me.TabControlEigenschaften.Controls.Add(Me.pageProperties) Me.TabControlEigenschaften.Controls.Add(Me.pageFormat) Me.TabControlEigenschaften.Enabled = False - Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 144) + Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 132) + 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(371, 465) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(378, 389) Me.TabControlEigenschaften.TabIndex = 22 ' 'pageProperties ' Me.pageProperties.Controls.Add(Me.pgControls) Me.pageProperties.Location = New System.Drawing.Point(4, 25) + 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) - Me.pageProperties.Size = New System.Drawing.Size(363, 436) + Me.pageProperties.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.pageProperties.Size = New System.Drawing.Size(370, 360) Me.pageProperties.TabIndex = 3 Me.pageProperties.Text = "Eigenschaften" Me.pageProperties.UseVisualStyleBackColor = True @@ -272,9 +250,10 @@ Partial Class frmFormDesigner ' Me.pgControls.Dock = System.Windows.Forms.DockStyle.Fill Me.pgControls.HelpVisible = False - Me.pgControls.Location = New System.Drawing.Point(3, 3) + 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(357, 430) + Me.pgControls.Size = New System.Drawing.Size(364, 356) Me.pgControls.TabIndex = 0 ' 'pageFormat @@ -287,9 +266,10 @@ Partial Class frmFormDesigner 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, 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) - Me.pageFormat.Size = New System.Drawing.Size(363, 439) + Me.pageFormat.Padding = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.pageFormat.Size = New System.Drawing.Size(313, 290) Me.pageFormat.TabIndex = 1 Me.pageFormat.Text = "Format" Me.pageFormat.UseVisualStyleBackColor = True @@ -299,9 +279,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(94, 69) + Me.btnheight_minus.Location = New System.Drawing.Point(44, 24) + 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(75, 25) + Me.btnheight_minus.Size = New System.Drawing.Size(34, 9) Me.btnheight_minus.TabIndex = 1 Me.btnheight_minus.Text = "kleiner" Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -312,9 +293,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(13, 69) + Me.btnheight_plus.Location = New System.Drawing.Point(6, 24) + 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, 25) + Me.btnheight_plus.Size = New System.Drawing.Size(34, 9) Me.btnheight_plus.TabIndex = 0 Me.btnheight_plus.Text = "größer" Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -323,7 +305,7 @@ Partial Class frmFormDesigner 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(10, 50) + Me.Label3.Location = New System.Drawing.Point(5, 18) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 16) Me.Label3.TabIndex = 5 @@ -332,7 +314,7 @@ Partial Class frmFormDesigner 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(10, 3) + Me.Label2.Location = New System.Drawing.Point(5, 2) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(46, 16) Me.Label2.TabIndex = 4 @@ -343,9 +325,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(94, 22) + Me.btnwidth_minus.Location = New System.Drawing.Point(44, 8) + 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(75, 25) + Me.btnwidth_minus.Size = New System.Drawing.Size(34, 9) Me.btnwidth_minus.TabIndex = 1 Me.btnwidth_minus.Text = "kleiner" Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -356,9 +339,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(13, 22) + Me.btnwidth_plus.Location = New System.Drawing.Point(6, 8) + 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(75, 25) + Me.btnwidth_plus.Size = New System.Drawing.Size(34, 9) Me.btnwidth_plus.TabIndex = 0 Me.btnwidth_plus.Text = "größer" Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -379,23 +363,10 @@ Partial Class frmFormDesigner Me.TBDD_CONNECTIONBindingSource.DataMember = "TBDD_CONNECTION" Me.TBDD_CONNECTIONBindingSource.DataSource = Me.DD_DMSLiteDataSet ' - 'btndelete - ' - Me.btndelete.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.btndelete.Image = Global.DD_ProcessManager.My.Resources.Resources.delete_12x12 - Me.btndelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btndelete.Location = New System.Drawing.Point(7, 624) - Me.btndelete.Name = "btndelete" - Me.btndelete.Size = New System.Drawing.Size(124, 23) - Me.btndelete.TabIndex = 1 - Me.btndelete.Text = "Control löschen" - Me.btndelete.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btndelete.UseVisualStyleBackColor = True - ' 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 650) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 669) Me.StatusStrip1.Name = "StatusStrip1" Me.StatusStrip1.Size = New System.Drawing.Size(1227, 22) Me.StatusStrip1.TabIndex = 20 @@ -408,19 +379,6 @@ Partial Class frmFormDesigner Me.tslblAenderungen.Size = New System.Drawing.Size(152, 17) Me.tslblAenderungen.Text = "Noch keine Änderungen" ' - 'btnrefresh - ' - Me.btnrefresh.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.btnrefresh.Image = Global.DD_ProcessManager.My.Resources.Resources.arrow_refresh - Me.btnrefresh.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft - Me.btnrefresh.Location = New System.Drawing.Point(260, 624) - Me.btnrefresh.Name = "btnrefresh" - Me.btnrefresh.Size = New System.Drawing.Size(110, 23) - Me.btnrefresh.TabIndex = 24 - Me.btnrefresh.Text = "Refresh" - Me.btnrefresh.TextAlign = System.Drawing.ContentAlignment.MiddleRight - Me.btnrefresh.UseVisualStyleBackColor = True - ' 'TBPM_PROFILE_CONTROLSTableAdapter ' Me.TBPM_PROFILE_CONTROLSTableAdapter.ClearBeforeFill = True @@ -479,7 +437,7 @@ Partial Class frmFormDesigner 'SplitContainer1 ' Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainer1.Location = New System.Drawing.Point(0, 0) + Me.SplitContainer1.Location = New System.Drawing.Point(0, 146) Me.SplitContainer1.Name = "SplitContainer1" ' 'SplitContainer1.Panel1 @@ -490,28 +448,130 @@ Partial Class frmFormDesigner ' Me.SplitContainer1.Panel2.Controls.Add(Me.GroupBox1) Me.SplitContainer1.Panel2.Controls.Add(Me.TabControlEigenschaften) - Me.SplitContainer1.Panel2.Controls.Add(Me.btnrefresh) - Me.SplitContainer1.Panel2.Controls.Add(Me.btndelete) - Me.SplitContainer1.Size = New System.Drawing.Size(1227, 650) + Me.SplitContainer1.Size = New System.Drawing.Size(1227, 523) Me.SplitContainer1.SplitterDistance = 842 Me.SplitContainer1.TabIndex = 25 ' + 'pnldesigner + ' + Me.pnldesigner.AllowDrop = True + Me.pnldesigner.AutoScroll = True + Me.pnldesigner.BackColor = System.Drawing.Color.Transparent + Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle + Me.pnldesigner.Controls.Add(Me.Label1) + Me.pnldesigner.Controls.Add(Me.lblhintergrund) + Me.pnldesigner.Dock = System.Windows.Forms.DockStyle.Fill + Me.pnldesigner.GridSize = 10 + Me.pnldesigner.Location = New System.Drawing.Point(0, 0) + Me.pnldesigner.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) + Me.pnldesigner.Name = "pnldesigner" + Me.pnldesigner.ShowGrid = True + Me.pnldesigner.Size = New System.Drawing.Size(842, 523) + Me.pnldesigner.TabIndex = 3 + ' + 'Label1 + ' + Me.Label1.AutoSize = True + Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption + Me.Label1.Location = New System.Drawing.Point(40, 50) + Me.Label1.Name = "Label1" + Me.Label1.Size = New System.Drawing.Size(347, 16) + Me.Label1.TabIndex = 6 + Me.Label1.Text = "Gestalten sie in diesem Bereich Ihre Validierungsoberfläche" + ' + 'lblhintergrund + ' + 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(40, 40) + Me.lblhintergrund.Name = "lblhintergrund" + Me.lblhintergrund.Size = New System.Drawing.Size(248, 29) + Me.lblhintergrund.TabIndex = 1 + Me.lblhintergrund.Text = "Validierungsbereich" + ' + 'RibbonControl1 + ' + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2}) + Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) + Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.Size = New System.Drawing.Size(1227, 146) + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'bbtnItemFinishSQL + ' + Me.bbtnItemFinishSQL.Caption = "Button Abschluss CheckSQL" + Me.bbtnItemFinishSQL.Id = 1 + Me.bbtnItemFinishSQL.ImageOptions.SvgImage = CType(resources.GetObject("bbtnItemFinishSQL.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnItemFinishSQL.Name = "bbtnItemFinishSQL" + ' + 'BarButtonItem1 + ' + Me.BarButtonItem1.Caption = "Control löschen" + Me.BarButtonItem1.Id = 2 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'BarButtonItem2 + ' + Me.BarButtonItem2.Caption = "Aktualisieren" + Me.BarButtonItem2.Id = 3 + Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem2.Name = "BarButtonItem2" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Name = "RibbonPage1" + Me.RibbonPage1.Text = "Hintergrundfunktionen" + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnItemFinishSQL) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + Me.RibbonPageGroup1.Text = "Funktionen" + ' + 'RibbonPageGroup2 + ' + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem2) + Me.RibbonPageGroup2.Name = "RibbonPageGroup2" + Me.RibbonPageGroup2.Text = "Control-Funktionen" + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 691) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1227, 21) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' 'frmFormDesigner ' + Me.Appearance.Options.UseFont = True Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.ClientSize = New System.Drawing.Size(1227, 672) + Me.ClientSize = New System.Drawing.Size(1227, 712) Me.Controls.Add(Me.SplitContainer1) Me.Controls.Add(Me.StatusStrip1) + Me.Controls.Add(Me.RibbonStatusBar1) + Me.Controls.Add(Me.RibbonControl1) Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.IconOptions.Icon = CType(resources.GetObject("frmFormDesigner.IconOptions.Icon"), System.Drawing.Icon) Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4) Me.MinimizeBox = False Me.Name = "frmFormDesigner" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 Me.Text = "Validation-Designer" Me.GroupBox1.ResumeLayout(False) - Me.pnldesigner.ResumeLayout(False) - Me.pnldesigner.PerformLayout() Me.TabControlEigenschaften.ResumeLayout(False) Me.pageProperties.ResumeLayout(False) Me.pageFormat.ResumeLayout(False) @@ -528,6 +588,9 @@ Partial Class frmFormDesigner Me.SplitContainer1.Panel2.ResumeLayout(False) CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) + Me.pnldesigner.ResumeLayout(False) + Me.pnldesigner.PerformLayout() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -542,7 +605,6 @@ Partial Class frmFormDesigner Friend WithEvents pnldesigner As DD_ProcessManager.ClassSnapPanel Friend WithEvents btndtp As System.Windows.Forms.Button Friend WithEvents lblhintergrund As System.Windows.Forms.Label - Friend WithEvents btndelete As System.Windows.Forms.Button Friend WithEvents Label1 As System.Windows.Forms.Label Friend WithEvents StatusStrip1 As System.Windows.Forms.StatusStrip Friend WithEvents tslblAenderungen As System.Windows.Forms.ToolStripStatusLabel @@ -564,7 +626,6 @@ Partial Class frmFormDesigner Friend WithEvents btnTabelle As System.Windows.Forms.Button Friend WithEvents TBPM_CONTROL_TABLEBindingSource As System.Windows.Forms.BindingSource Friend WithEvents TBPM_CONTROL_TABLETableAdapter As DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter - Friend WithEvents btnrefresh As System.Windows.Forms.Button Friend WithEvents pageProperties As TabPage Friend WithEvents pgControls As PropertyGrid Friend WithEvents btnLine As Button @@ -572,4 +633,13 @@ Partial Class frmFormDesigner Friend WithEvents MenuItemAddColumn As ToolStripMenuItem Friend WithEvents SplitContainer1 As SplitContainer Friend WithEvents btnButton As Button + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents bbtnItemFinishSQL As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup End Class diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx index 3c86179..48e2412 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.resx +++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx @@ -140,9 +140,6 @@ 206, 17 - - 206, 17 - 17, 56 @@ -176,10 +173,79 @@ 17, 17 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAN4DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iRmluaXNoTWVyZ2UiPg0KICAgIDxwYXRoIGQ9Ik0xMy4yLDE4Yy0wLjMsMC42LTAu + NiwxLjMtMC44LDJINnYtMkgxMy4yeiBNMTIuMSwyNEg0VjJoMTZ2MTAuNGMwLjYtMC4yLDEuMy0wLjMs + Mi0wLjRWMWMwLTAuNS0wLjUtMS0xLTEgICBIM0MyLjUsMCwyLDAuNSwyLDF2MjRjMCwwLjUsMC41LDEs + MSwxaDkuNEMxMi4yLDI1LjQsMTIuMSwyNC43LDEyLjEsMjR6IE02LDE2aDguNWMwLjYtMC44LDEuNC0x + LjQsMi4yLTJINlYxNnogTTYsOGgxMlY2SDZWOHoiIGNsYXNzPSJCbGFjayIgLz4NCiAgICA8cmVjdCB4 + PSI2IiB5PSIxMCIgd2lkdGg9IjEyIiBoZWlnaHQ9IjIiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IlllbGxv + 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 + + - 213 + 84 - + AAABAAkAMDAQAAEABABoBgAAlgAAACAgEAABAAQA6AIAAP4GAAAQEBAAAQAEACgBAADmCQAALzAAAAEA CACoDgAADgsAACAgAAABAAgAqAgAALYZAAAQEAAAAQAIAGgFAABeIgAALzAAAAEAIADoJAAAxicAACAg diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 298f871..51e5e62 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -346,7 +346,7 @@ Public Class frmFormDesigner SetMovementHandlers(label) TBPM_PROFILE_CONTROLSTableAdapter.cmdInsertAnlage(ProfileId, label.Name, "LBL", label.Text, label.Location.X, label.Location.Y, USER_USERNAME, label.Size.Height, label.Size.Width) - + CHANGES_IN_ADMINISTRATION = True CurrentControl = label CurrentControl.Tag = New ClassControlCreator.ControlMetadata() With { .Guid = GetLastID(), @@ -361,7 +361,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(), @@ -375,7 +375,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(), @@ -389,7 +389,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(), @@ -403,7 +403,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(), @@ -418,7 +418,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(), @@ -434,7 +434,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 @@ -453,7 +453,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(), @@ -468,7 +468,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(), @@ -594,12 +594,6 @@ Public Class frmFormDesigner Return pnldesigner.PointToClient(Cursor.Position) End Function - Private Sub btndelete_Click(sender As System.Object, e As EventArgs) Handles btndelete.Click - If CurrentControl Is Nothing = False Then - DeleteControl(CurrentControl.Name) - TabControlEigenschaften.Enabled = False - End If - End Sub Private Sub btnwidth_plus_Click(sender As System.Object, e As EventArgs) Handles btnwidth_plus.Click If CurrentControl Is Nothing = False Then @@ -653,9 +647,6 @@ Public Class frmFormDesigner End If End Sub - Private Sub btnrefresh_Click(sender As Object, e As EventArgs) Handles btnrefresh.Click - LoadControls() - End Sub ''' ''' Setzt die Eventhandler für ein Control, die für die Bewegung via Drag & Drop und das Laden der Eigentschaften verantwortlich sind @@ -1033,10 +1024,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", "") @@ -1145,4 +1142,44 @@ Public Class frmFormDesigner LOGGER.Error(ex) End Try End Sub + + Private Sub bbtnItemFinishSQL_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnItemFinishSQL.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 BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + If CurrentControl Is Nothing = False Then + DeleteControl(CurrentControl.Name) + TabControlEigenschaften.Enabled = False + End If + End Sub + + Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick + LoadControls() + End Sub End Class \ No newline at end of file diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index b200d9a..5148fe2 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -860,7 +860,15 @@ Public Class frmValidator If filteredData.Rows.Count = 1 Then 'AddHandler lookup.EditValueChanged, AddressOf onLookUp1 AddHandler lookup.SelectedValuesChanged, AddressOf onLookUpselectedValue + Else + oExpression = $"SQL_ENABLE like '%#CTRL#{oMyControl.Name}%'" + DTCONTROLS.Select(oExpression).CopyToDataTable(filteredData, LoadOption.PreserveChanges) + If filteredData.Rows.Count = 1 Then + 'AddHandler lookup.EditValueChanged, AddressOf onLookUp1 + AddHandler lookup.SelectedValuesChanged, AddressOf onLookUpselectedValue + End If End If + filteredData = DTCONTROLS.Clone() oExpression = $"GUID = {oControlRow.Item("GUID")} and Len(SET_CONTROL_DATA) > 0" DTCONTROLS.Select(oExpression).CopyToDataTable(filteredData, LoadOption.PreserveChanges) @@ -1320,6 +1328,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 ") @@ -1564,6 +1573,13 @@ Public Class frmValidator End If 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 LookupControl_DependingColumn(LookupControl As LookupControl2, SelectedValues As List(Of String)) Dim oSQLColumnDatatable As DataTable = DTGRID_COLUMNS_WITH_SQL.Clone() Dim oExpression = $"SQL_COMMAND like '%#CTRL#{LookupControl.Name}%'" @@ -1623,36 +1639,6 @@ Public Class frmValidator sql_Statement = clsPatterns.ReplaceAllValues(sql_Statement, pnldesigner, CURRENT_WMFILE, 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)) @@ -1666,18 +1652,71 @@ 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 + 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, CURRENT_WMFILE, 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 Private Sub Depending_Control_Set_Result(displayboxname As String, sqlCommand As String, sqlConnection As String) Try Dim resultDT As DataTable = ClassDatabase.Return_Datatable_ConStr(sqlCommand, sqlConnection)