diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 0649d40..ef81e1f 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - + diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb index 04baf47..c354c2b 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -66,11 +66,13 @@ Partial Class frmFormDesigner Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem() Me.BarButtonItem3 = New DevExpress.XtraBars.BarButtonItem() + Me.BarButtonItem4 = 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.Panel1 = New System.Windows.Forms.Panel() Me.GroupBox1.SuspendLayout() Me.pnldesigner.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() @@ -88,6 +90,7 @@ Partial Class frmFormDesigner Me.SplitContainer1.Panel2.SuspendLayout() Me.SplitContainer1.SuspendLayout() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'GroupBox1 @@ -106,7 +109,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, 111) + Me.GroupBox1.Size = New System.Drawing.Size(381, 127) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -116,10 +119,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(213, 15) + Me.btnButton.Location = New System.Drawing.Point(219, 30) Me.btnButton.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnButton.Name = "btnButton" - Me.btnButton.Size = New System.Drawing.Size(82, 26) + Me.btnButton.Size = New System.Drawing.Size(100, 24) Me.btnButton.TabIndex = 8 Me.btnButton.Text = "Button" Me.btnButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -130,10 +133,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(213, 76) + Me.btnLine.Location = New System.Drawing.Point(219, 86) Me.btnLine.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnLine.Name = "btnLine" - Me.btnLine.Size = New System.Drawing.Size(82, 28) + Me.btnLine.Size = New System.Drawing.Size(100, 24) Me.btnLine.TabIndex = 7 Me.btnLine.Text = "Linie" Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -144,10 +147,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(111, 15) + Me.btnTabelle.Location = New System.Drawing.Point(113, 30) Me.btnTabelle.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnTabelle.Name = "btnTabelle" - Me.btnTabelle.Size = New System.Drawing.Size(98, 26) + Me.btnTabelle.Size = New System.Drawing.Size(100, 24) Me.btnTabelle.TabIndex = 6 Me.btnTabelle.Text = "Tabelle" Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -158,10 +161,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(111, 76) + Me.btnCheckbox.Location = New System.Drawing.Point(113, 86) Me.btnCheckbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnCheckbox.Name = "btnCheckbox" - Me.btnCheckbox.Size = New System.Drawing.Size(98, 28) + Me.btnCheckbox.Size = New System.Drawing.Size(100, 24) Me.btnCheckbox.TabIndex = 5 Me.btnCheckbox.Text = "Checkbox" Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -172,10 +175,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(9, 76) + Me.btnVektor.Location = New System.Drawing.Point(7, 86) Me.btnVektor.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnVektor.Name = "btnVektor" - Me.btnVektor.Size = New System.Drawing.Size(98, 28) + Me.btnVektor.Size = New System.Drawing.Size(100, 24) Me.btnVektor.TabIndex = 4 Me.btnVektor.Text = "LookupControl" Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -186,10 +189,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(111, 44) + Me.btndtp.Location = New System.Drawing.Point(113, 58) Me.btndtp.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btndtp.Name = "btndtp" - Me.btndtp.Size = New System.Drawing.Size(98, 28) + Me.btndtp.Size = New System.Drawing.Size(100, 24) Me.btndtp.TabIndex = 3 Me.btndtp.Text = "DatePicker" Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -200,10 +203,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(9, 44) + Me.btntextbox.Location = New System.Drawing.Point(7, 58) Me.btntextbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btntextbox.Name = "btntextbox" - Me.btntextbox.Size = New System.Drawing.Size(98, 28) + Me.btntextbox.Size = New System.Drawing.Size(100, 24) Me.btntextbox.TabIndex = 1 Me.btntextbox.Text = "Textbox" Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -214,10 +217,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(9, 15) + Me.btnlabel.Location = New System.Drawing.Point(7, 30) Me.btnlabel.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnlabel.Name = "btnlabel" - Me.btnlabel.Size = New System.Drawing.Size(97, 26) + Me.btnlabel.Size = New System.Drawing.Size(100, 24) Me.btnlabel.TabIndex = 0 Me.btnlabel.Text = "Label" Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -244,7 +247,7 @@ Partial Class frmFormDesigner ' Me.Label1.AutoSize = True Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.Label1.Location = New System.Drawing.Point(70, 100) + Me.Label1.Location = New System.Drawing.Point(50, 60) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(347, 16) Me.Label1.TabIndex = 6 @@ -255,7 +258,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(70, 70) + Me.lblhintergrund.Location = New System.Drawing.Point(50, 50) Me.lblhintergrund.Name = "lblhintergrund" Me.lblhintergrund.Size = New System.Drawing.Size(248, 29) Me.lblhintergrund.TabIndex = 1 @@ -263,17 +266,15 @@ Partial Class frmFormDesigner ' '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.Dock = System.Windows.Forms.DockStyle.Fill Me.TabControlEigenschaften.Enabled = False - Me.TabControlEigenschaften.Location = New System.Drawing.Point(3, 115) + Me.TabControlEigenschaften.Location = New System.Drawing.Point(0, 0) 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(373, 367) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(381, 356) Me.TabControlEigenschaften.TabIndex = 22 ' 'pageProperties @@ -283,7 +284,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(365, 338) + Me.pageProperties.Size = New System.Drawing.Size(373, 327) Me.pageProperties.TabIndex = 3 Me.pageProperties.Text = "Eigenschaften" Me.pageProperties.UseVisualStyleBackColor = True @@ -295,7 +296,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(359, 334) + Me.pgControls.Size = New System.Drawing.Size(367, 323) Me.pgControls.TabIndex = 0 ' 'pageFormat @@ -307,11 +308,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, 22) + Me.pageFormat.Location = New System.Drawing.Point(4, 25) 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(311, 250) + Me.pageFormat.Size = New System.Drawing.Size(373, 327) Me.pageFormat.TabIndex = 1 Me.pageFormat.Text = "Format" Me.pageFormat.UseVisualStyleBackColor = True @@ -321,10 +322,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(80, 54) + Me.btnheight_minus.Location = New System.Drawing.Point(117, 64) 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(65, 27) + Me.btnheight_minus.Size = New System.Drawing.Size(100, 24) Me.btnheight_minus.TabIndex = 1 Me.btnheight_minus.Text = "kleiner" Me.btnheight_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -335,10 +336,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(10, 54) + Me.btnheight_plus.Location = New System.Drawing.Point(11, 64) 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(64, 27) + Me.btnheight_plus.Size = New System.Drawing.Size(100, 24) Me.btnheight_plus.TabIndex = 0 Me.btnheight_plus.Text = "größer" Me.btnheight_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -347,7 +348,7 @@ Partial Class frmFormDesigner 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(8, 40) + Me.Label3.Location = New System.Drawing.Point(6, 46) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 16) Me.Label3.TabIndex = 5 @@ -356,7 +357,7 @@ Partial Class frmFormDesigner 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(8, 2) + Me.Label2.Location = New System.Drawing.Point(6, 2) Me.Label2.Name = "Label2" Me.Label2.Size = New System.Drawing.Size(46, 16) Me.Label2.TabIndex = 4 @@ -367,10 +368,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(80, 15) + Me.btnwidth_minus.Location = New System.Drawing.Point(117, 20) 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(65, 24) + Me.btnwidth_minus.Size = New System.Drawing.Size(100, 24) Me.btnwidth_minus.TabIndex = 1 Me.btnwidth_minus.Text = "kleiner" Me.btnwidth_minus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -381,10 +382,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(9, 15) + Me.btnwidth_plus.Location = New System.Drawing.Point(11, 20) 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(65, 24) + Me.btnwidth_plus.Size = New System.Drawing.Size(100, 24) Me.btnwidth_plus.TabIndex = 0 Me.btnwidth_plus.Text = "größer" Me.btnwidth_plus.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -488,8 +489,8 @@ Partial Class frmFormDesigner ' 'SplitContainer1.Panel2 ' + Me.SplitContainer1.Panel2.Controls.Add(Me.Panel1) Me.SplitContainer1.Panel2.Controls.Add(Me.GroupBox1) - Me.SplitContainer1.Panel2.Controls.Add(Me.TabControlEigenschaften) Me.SplitContainer1.Size = New System.Drawing.Size(1227, 483) Me.SplitContainer1.SplitterDistance = 842 Me.SplitContainer1.TabIndex = 25 @@ -497,9 +498,9 @@ Partial Class frmFormDesigner 'RibbonControl1 ' Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3}) + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.MaxItemId = 5 Me.RibbonControl1.Name = "RibbonControl1" Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl1.Size = New System.Drawing.Size(1227, 146) @@ -526,6 +527,13 @@ Partial Class frmFormDesigner Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem3.Name = "BarButtonItem3" ' + 'BarButtonItem4 + ' + Me.BarButtonItem4.Caption = "Designer locked" + Me.BarButtonItem4.Id = 4 + Me.BarButtonItem4.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem4.Name = "BarButtonItem4" + ' 'RibbonPage1 ' Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) @@ -535,6 +543,7 @@ Partial Class frmFormDesigner 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem4) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Aktionen" ' @@ -557,6 +566,15 @@ Partial Class frmFormDesigner Me.RibbonPage2.Name = "RibbonPage2" Me.RibbonPage2.Text = "RibbonPage2" ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.TabControlEigenschaften) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel1.Location = New System.Drawing.Point(0, 127) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(381, 356) + Me.Panel1.TabIndex = 23 + ' 'frmFormDesigner ' Me.Appearance.Options.UseFont = True @@ -595,6 +613,7 @@ Partial Class frmFormDesigner CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainer1.ResumeLayout(False) CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -646,4 +665,6 @@ Partial Class frmFormDesigner Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents Panel1 As Panel End Class diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.resx b/app/DD_PM_WINDREAM/frmFormDesigner.resx index 2aa0895..9c755e7 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 @@ -243,6 +240,32 @@ MTBsMy41LTMuNUM5LjcsMjYuNywxMi43LDI4LDE2LDI4YzUuOSwwLDEwLjgtNC4zLDExLjgtMTAgICBo LTQuMUMyMi44LDIxLjQsMTkuNywyNCwxNiwyNHoiIGNsYXNzPSJCbHVlIiAvPg0KICA8L2c+DQo8L3N2 Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFYEAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntkaXNwbGF5Om5vbmU7fQoJLnN0M3tk + aXNwbGF5OmlubGluZTtmaWxsOiNGRkIxMTU7fQoJLnN0NHtkaXNwbGF5OmlubGluZTt9Cgkuc3Q1e2Rp + c3BsYXk6aW5saW5lO29wYWNpdHk6MC43NTt9Cgkuc3Q2e2Rpc3BsYXk6aW5saW5lO29wYWNpdHk6MC41 + O30KCS5zdDd7ZGlzcGxheTppbmxpbmU7ZmlsbDojMDM5QzIzO30KCS5zdDh7ZGlzcGxheTppbmxpbmU7 + ZmlsbDojRDExQzFDO30KCS5zdDl7ZGlzcGxheTppbmxpbmU7ZmlsbDojMTE3N0Q3O30KCS5zdDEwe2Rp + c3BsYXk6aW5saW5lO2ZpbGw6I0ZGRkZGRjt9Cjwvc3R5bGU+DQogIDxnIGlkPSJTZWN1cml0eV94NUZf + UGVybWlzc2lvbiI+DQogICAgPHBhdGggZD0iTTI3LDEwaC0zVjhjMC00LjQtMy42LTgtOC04UzgsMy42 + LDgsOHYySDVjLTAuNiwwLTEsMC41LTEsMXYxOGMwLDAuNSwwLjQsMSwxLDFoMjJjMC42LDAsMS0wLjUs + MS0xVjExICAgQzI4LDEwLjUsMjcuNiwxMCwyNywxMHogTTE4LDI0aC00bDEuNC00LjFjLTAuOC0wLjMt + MS40LTEtMS40LTEuOWMwLTEuMSwwLjktMiwyLTJzMiwwLjksMiwyYzAsMC45LTAuNiwxLjYtMS40LDEu + OUwxOCwyNHogTTEyLDEwICAgVjhjMC0yLjIsMS44LTQsNC00czQsMS44LDQsNHYySDEyeiIgY2xhc3M9 + IlllbGxvdyIgLz4NCiAgPC9nPg0KPC9zdmc+Cw== diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 74c9c0a..ced0107 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -8,6 +8,7 @@ Imports DigitalData.Controls.LookupGrid Imports System.Drawing Public Class frmFormDesigner + Public Designer_Locked As Boolean = True Public ProfileId As Integer Public ProfileName As String Public ProfileObjectType As String @@ -33,6 +34,9 @@ Public Class frmFormDesigner Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load Try + BarButtonItem4.Caption = "Designer locked" + BarButtonItem4.ItemAppearance.Normal.BackColor = Color.Red + Designer_Locked = True ' Setzt den typ des SQL-Befehls für frmSQL_DESIGNER CURRENT_DESIGN_TYPE = "INPUT_INDEX" @@ -282,8 +286,10 @@ Public Class frmFormDesigner End Sub Private Sub DragDropButtons_MouseDown(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btndtp.MouseDown, btnVektor.MouseDown, btnTabelle.MouseDown, btnCheckbox.MouseDown, btnLine.MouseDown, btnButton.MouseDown + If Designer_Locked Then + Exit Sub + End If Mouse_IsPressed = True - CurrentControl = Nothing End Sub @@ -581,7 +587,7 @@ Public Class frmFormDesigner Return pnldesigner.PointToClient(Cursor.Position) End Function - Private Sub btndelete_Click(sender As System.Object, e As EventArgs) + Private Sub btndelete_Click(sender As System.Object, e As EventArgs) If CurrentControl Is Nothing = False Then DeleteControl(CurrentControl.Name) TabControlEigenschaften.Enabled = False @@ -642,7 +648,7 @@ Public Class frmFormDesigner End If End Sub - Private Sub btnrefresh_Click(sender As Object, e As EventArgs) + Private Sub btnrefresh_Click(sender As Object, e As EventArgs) LoadControls() End Sub @@ -658,6 +664,9 @@ Public Class frmFormDesigner Private Sub OnControl_MouseDown(sender As Control, e As MouseEventArgs) If e.Button = MouseButtons.Left Then + If Designer_Locked Then + Exit Sub + End If CurrentControl = sender Mouse_BeginLocation = e.Location sender.BringToFront() @@ -1179,4 +1188,18 @@ Public Class frmFormDesigner Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick LoadControls() End Sub + + Private Sub BarButtonItem4_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem4.ItemClick + If BarButtonItem4.Caption = "Designer locked" Then + + BarButtonItem4.Caption = "Designer active" + BarButtonItem4.ItemAppearance.Normal.BackColor = Color.Lime + Designer_Locked = False + Else + + BarButtonItem4.Caption = "Designer locked" + BarButtonItem4.ItemAppearance.Normal.BackColor = Color.Red + Designer_Locked = True + End If + 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 353d4d1..dc3f6e4 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -55,7 +55,7 @@ Public Class frmValidator Private DTCONTROLS As DataTable Private DTGRID_COLUMNS_WITH_SQL As DataTable Private DTGRID_COLUMNS As DataTable - Private DTGRID_COLUMNS_TEXTBOX As DataTable + Private DTGRID_SQL_DEFINITION As DataTable Public FormLoaded As Boolean = False Private ItemWorked As Boolean = False @@ -231,7 +231,7 @@ Public Class frmValidator End If LOGGER.Debug("Right_Delete: " & USER_RIGHT_FILE_DELETE.ToString) Create_Controls() - Controls2beDisabled + Controls2beDisabled() End If End If @@ -247,7 +247,7 @@ Public Class frmValidator Private Sub Controls2beDisabled() Try Dim oFilteredDatatable As DataTable = DTCONTROLS.Clone() - Dim oExpression = $"LEN(SQL_ENABLE) > 0'" + 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!!") @@ -256,8 +256,10 @@ Public Class frmValidator 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 + If oENABLE_GUID = DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid Then + oControl.Enabled = False + Exit For + End If Next Next Catch ex As Exception @@ -669,8 +671,8 @@ Public Class frmValidator oSQL = $"SELECT T.* from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} ORDER BY T.SEQUENCE" DTGRID_COLUMNS = ClassDatabase.Return_Datatable(oSQL) - oSQL = $"SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.SQL_COMMAND, T.SPALTENNAME from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(T.SQL_COMMAND) > 0 AND T.LOAD_AFT_LOAD_CONTROL = 1 ORDER BY T.SEQUENCE" - DTGRID_COLUMNS_TEXTBOX = ClassDatabase.Return_Datatable(oSQL) + oSQL = $"SELECT T1.GUID As CONTROL_ID, T1.PROFIL_ID, T.CONNECTION_ID, T.SQL_COMMAND, T.SPALTENNAME from TBPM_CONTROL_TABLE T, TBPM_PROFILE_CONTROLS T1 WHERE T.CONTROL_ID = T1.GUID AND T1.PROFIL_ID = {CURRENT_ProfilGUID} AND LEN(T.SQL_COMMAND) > 0 AND T.LOAD_AFT_LOAD_CONTROL = 1 ORDER BY T.SEQUENCE" + DTGRID_SQL_DEFINITION = ClassDatabase.Return_Datatable(oSQL) Dim oCount As Integer = 0 @@ -2654,20 +2656,18 @@ Public Class frmValidator ' set_foreground() If first_control Is Nothing = False Then first_control.Focus() Try - For Each oRow As DataRow In DTGRID_COLUMNS_TEXTBOX.Rows + For Each oRow As DataRow In DTGRID_SQL_DEFINITION.Rows Dim oDEPENDING_GUID = oRow.Item("CONTROL_ID") Dim oDEPENDING_COLUMN = oRow.Item("SPALTENNAME") + Dim oCONNID = oRow.Item("CONNECTION_ID") Dim oSqlCommand = oRow.Item("SQL_COMMAND") oSqlCommand = clsPatterns.ReplaceAllValues(oSqlCommand, pnldesigner, Nothing, USER_PRENAME, USER_SURNAME, USER_SHORTNAME, USER_LANGUAGE, USER_EMAIL, USER_ID, CURRENT_CLICKED_PROFILE_ID) - - Try - Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable(oSqlCommand) + Dim oDTDEPENDING_RESULT As DataTable = ClassDatabase.Return_Datatable_ConId(oSqlCommand, oCONNID) If Not IsNothing(oDTDEPENDING_RESULT) Then For Each oControl As Control In pnldesigner.Controls If DirectCast(oControl.Tag, ClassControlCreator.ControlMetadata).Guid = oDEPENDING_GUID Then ClassControlCreator.GridTables.Add(oDEPENDING_COLUMN, oDTDEPENDING_RESULT) - Exit For End If Next