From e81183a69890278d909036ac5a4edf6ef54ae353 Mon Sep 17 00:00:00 2001 From: Digital Data - Marlon Schreiber Date: Wed, 18 Mar 2020 10:49:24 +0100 Subject: [PATCH] DesignerLock --- app/DD_PM_WINDREAM/ClassDatabase.vb | 12 +- app/DD_PM_WINDREAM/ClassWindream_allgemein.vb | 4 +- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 2 +- .../frmFormDesigner.Designer.vb | 193 +++++++++++------- app/DD_PM_WINDREAM/frmFormDesigner.resx | 26 +++ app/DD_PM_WINDREAM/frmFormDesigner.vb | 22 ++ app/DD_PM_WINDREAM/frmMain.vb | 37 ++-- app/DD_PM_WINDREAM/frmValidator.vb | 6 +- 8 files changed, 194 insertions(+), 108 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassDatabase.vb b/app/DD_PM_WINDREAM/ClassDatabase.vb index ca7aaba..4cd6883 100644 --- a/app/DD_PM_WINDREAM/ClassDatabase.vb +++ b/app/DD_PM_WINDREAM/ClassDatabase.vb @@ -80,7 +80,7 @@ Public Class ClassDatabase Public Shared Function Return_Datatable_ConId(SQLCommand As String, ConnID As Integer, Optional userInput As Boolean = False) Try Dim oConnString = Get_ConnectionString(ConnID) - LOGGER.Debug("ReturnDatatable: " & SQLCommand) + LOGGER.Debug($"Return_Datatable_ConId [{ConnID}]: " & SQLCommand) Dim oSQLconnect As New SqlClient.SqlConnection Dim oSQLcommand As SqlClient.SqlCommand oSQLconnect.ConnectionString = oConnString @@ -103,7 +103,7 @@ Public Class ClassDatabase End Function Public Shared Function Return_Datatable_ConStr(SQLCommand As String, ConNStr As String, Optional userInput As Boolean = False) Try - LOGGER.Debug("ReturnDatatable: " & SQLCommand) + LOGGER.Debug("Return_Datatable_ConStr: " & SQLCommand) Dim oSQLconnect As New SqlClient.SqlConnection Dim oSQLcommand As SqlClient.SqlCommand oSQLconnect.ConnectionString = ConNStr @@ -133,7 +133,7 @@ Public Class ClassDatabase SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo SQLcommand.CommandText = ExecuteCMD - LOGGER.Debug("Execute_Command Created: " & ExecuteCMD) + LOGGER.Debug("Execute_non_Query Created: " & ExecuteCMD) SQLcommand.ExecuteNonQuery() SQLcommand.Dispose() SQLconnect.Close() @@ -159,7 +159,7 @@ Public Class ClassDatabase SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo SQLcommand.CommandText = ExecuteCMD - LOGGER.Debug("Execute_Command Created: " & ExecuteCMD) + LOGGER.Debug("Execute_non_Query_ConStr Created: " & ExecuteCMD) SQLcommand.ExecuteNonQuery() SQLcommand.Dispose() SQLconnect.Close() @@ -187,7 +187,7 @@ Public Class ClassDatabase SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo SQLcommand.CommandText = cmdscalar - LOGGER.Debug("Execute_non_Query: " & cmdscalar) + LOGGER.Debug("Execute_Scalar: " & cmdscalar) result = SQLcommand.ExecuteScalar() SQLcommand.Dispose() SQLconnect.Close() @@ -213,7 +213,7 @@ Public Class ClassDatabase SQLcommand = SQLconnect.CreateCommand 'Update Last Created Record in Foo SQLcommand.CommandText = cmdscalar - LOGGER.Debug("Execute Scalar: " & cmdscalar) + LOGGER.Debug("Execute_Scalar_ConStr Scalar: " & cmdscalar) result = SQLcommand.ExecuteScalar() SQLcommand.Dispose() SQLconnect.Close() diff --git a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb index 17b0692..ce78987 100644 --- a/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb +++ b/app/DD_PM_WINDREAM/ClassWindream_allgemein.vb @@ -56,7 +56,7 @@ Public Class ClassWindream_allgemein Me.oConnect = CreateObject("Windream.WMConnect") 'MsgBox("windrem init 'ed") Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) LOGGER.Debug($"Error while creating WMConnect Object: {vbCrLf}{ex.Message}") Return False End Try @@ -111,7 +111,7 @@ LOGGER.Error(ex) ' Ordnertypen ausgelesen werden Me.oDokumentTypen = Me.oSession.GetWMObjectTypes(WINDREAMLib.WMEntity.WMEntityDocument) Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) Return False End Try diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index 36fdfb5..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 5aa378b..d8df6ef 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.Designer.vb @@ -58,7 +58,7 @@ Partial Class frmFormDesigner Me.TBPM_CONTROL_TABLETableAdapter = New DD_ProcessManager.DD_DMSLiteDataSetTableAdapters.TBPM_CONTROL_TABLETableAdapter() Me.GridControlContextMenu = New System.Windows.Forms.ContextMenuStrip(Me.components) Me.MenuItemAddColumn = New System.Windows.Forms.ToolStripMenuItem() - Me.SplitContainer1 = New System.Windows.Forms.SplitContainer() + Me.SplitContainerDesigner = 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() @@ -66,11 +66,14 @@ Partial Class frmFormDesigner Me.bbtnItemFinishSQL = New DevExpress.XtraBars.BarButtonItem() 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.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.Panel1 = New System.Windows.Forms.Panel() Me.GroupBox1.SuspendLayout() Me.TabControlEigenschaften.SuspendLayout() Me.pageProperties.SuspendLayout() @@ -82,12 +85,13 @@ Partial Class frmFormDesigner CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit() Me.GridControlContextMenu.SuspendLayout() - CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).BeginInit() - Me.SplitContainer1.Panel1.SuspendLayout() - Me.SplitContainer1.Panel2.SuspendLayout() - Me.SplitContainer1.SuspendLayout() + CType(Me.SplitContainerDesigner, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerDesigner.Panel1.SuspendLayout() + Me.SplitContainerDesigner.Panel2.SuspendLayout() + Me.SplitContainerDesigner.SuspendLayout() Me.pnldesigner.SuspendLayout() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'GroupBox1 @@ -100,12 +104,13 @@ Partial Class frmFormDesigner Me.GroupBox1.Controls.Add(Me.btndtp) Me.GroupBox1.Controls.Add(Me.btntextbox) Me.GroupBox1.Controls.Add(Me.btnlabel) + Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Top 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, 5) + Me.GroupBox1.Location = New System.Drawing.Point(0, 0) 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(362, 122) + Me.GroupBox1.Size = New System.Drawing.Size(373, 112) Me.GroupBox1.TabIndex = 2 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Control-Typ (Drag and Drop)" @@ -115,10 +120,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(215, 20) + Me.btnButton.Location = New System.Drawing.Point(219, 17) Me.btnButton.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnButton.Name = "btnButton" - Me.btnButton.Size = New System.Drawing.Size(98, 23) + Me.btnButton.Size = New System.Drawing.Size(100, 24) Me.btnButton.TabIndex = 8 Me.btnButton.Text = "Button" Me.btnButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -129,10 +134,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(215, 47) + Me.btnLine.Location = New System.Drawing.Point(219, 76) Me.btnLine.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnLine.Name = "btnLine" - Me.btnLine.Size = New System.Drawing.Size(98, 23) + Me.btnLine.Size = New System.Drawing.Size(100, 24) Me.btnLine.TabIndex = 7 Me.btnLine.Text = "Linie" Me.btnLine.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -143,10 +148,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, 20) + Me.btnTabelle.Location = New System.Drawing.Point(113, 20) Me.btnTabelle.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnTabelle.Name = "btnTabelle" - Me.btnTabelle.Size = New System.Drawing.Size(98, 23) + Me.btnTabelle.Size = New System.Drawing.Size(100, 24) Me.btnTabelle.TabIndex = 6 Me.btnTabelle.Text = "Tabelle" Me.btnTabelle.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -157,10 +162,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, 74) + Me.btnCheckbox.Location = New System.Drawing.Point(113, 76) Me.btnCheckbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnCheckbox.Name = "btnCheckbox" - Me.btnCheckbox.Size = New System.Drawing.Size(98, 23) + Me.btnCheckbox.Size = New System.Drawing.Size(100, 24) Me.btnCheckbox.TabIndex = 5 Me.btnCheckbox.Text = "Checkbox" Me.btnCheckbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -171,10 +176,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(7, 74) + Me.btnVektor.Location = New System.Drawing.Point(7, 76) Me.btnVektor.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btnVektor.Name = "btnVektor" - Me.btnVektor.Size = New System.Drawing.Size(98, 23) + Me.btnVektor.Size = New System.Drawing.Size(100, 24) Me.btnVektor.TabIndex = 4 Me.btnVektor.Text = "LookupControl" Me.btnVektor.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -185,10 +190,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, 47) + Me.btndtp.Location = New System.Drawing.Point(113, 48) Me.btndtp.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btndtp.Name = "btndtp" - Me.btndtp.Size = New System.Drawing.Size(98, 23) + Me.btndtp.Size = New System.Drawing.Size(100, 24) Me.btndtp.TabIndex = 3 Me.btndtp.Text = "DatePicker" Me.btndtp.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -199,10 +204,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(7, 47) + Me.btntextbox.Location = New System.Drawing.Point(7, 48) Me.btntextbox.Margin = New System.Windows.Forms.Padding(3, 2, 3, 2) Me.btntextbox.Name = "btntextbox" - Me.btntextbox.Size = New System.Drawing.Size(98, 23) + Me.btntextbox.Size = New System.Drawing.Size(100, 24) Me.btntextbox.TabIndex = 1 Me.btntextbox.Text = "Textbox" Me.btntextbox.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -216,7 +221,7 @@ Partial Class frmFormDesigner 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(98, 23) + Me.btnlabel.Size = New System.Drawing.Size(100, 24) Me.btnlabel.TabIndex = 0 Me.btnlabel.Text = "Label" Me.btnlabel.TextAlign = System.Drawing.ContentAlignment.MiddleRight @@ -224,17 +229,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(7, 106) + 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(366, 415) + Me.TabControlEigenschaften.Size = New System.Drawing.Size(373, 308) Me.TabControlEigenschaften.TabIndex = 22 ' 'pageProperties @@ -244,7 +247,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(358, 386) + Me.pageProperties.Size = New System.Drawing.Size(365, 279) Me.pageProperties.TabIndex = 3 Me.pageProperties.Text = "Eigenschaften" Me.pageProperties.UseVisualStyleBackColor = True @@ -256,7 +259,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(352, 382) + Me.pgControls.Size = New System.Drawing.Size(359, 275) Me.pgControls.TabIndex = 0 ' 'pageFormat @@ -272,7 +275,7 @@ Partial Class frmFormDesigner 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(358, 361) + Me.pageFormat.Size = New System.Drawing.Size(365, 279) Me.pageFormat.TabIndex = 1 Me.pageFormat.Text = "Format" Me.pageFormat.UseVisualStyleBackColor = True @@ -282,10 +285,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(84, 69) + Me.btnheight_minus.Location = New System.Drawing.Point(116, 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, 29) + 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 @@ -296,10 +299,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(7, 66) + Me.btnheight_plus.Location = New System.Drawing.Point(10, 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(72, 34) + 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 @@ -308,7 +311,7 @@ Partial Class frmFormDesigner 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Location = New System.Drawing.Point(8, 50) + Me.Label3.Location = New System.Drawing.Point(10, 46) Me.Label3.Name = "Label3" Me.Label3.Size = New System.Drawing.Size(42, 16) Me.Label3.TabIndex = 5 @@ -317,7 +320,7 @@ Partial Class frmFormDesigner 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(4, 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 @@ -328,10 +331,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(83, 21) + Me.btnwidth_minus.Location = New System.Drawing.Point(116, 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(66, 26) + 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 @@ -342,10 +345,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(7, 21) + Me.btnwidth_plus.Location = New System.Drawing.Point(10, 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(72, 27) + 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 @@ -369,9 +372,9 @@ Partial Class frmFormDesigner 'StatusStrip1 ' Me.StatusStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tslblAenderungen}) - Me.StatusStrip1.Location = New System.Drawing.Point(0, 669) + Me.StatusStrip1.Location = New System.Drawing.Point(0, 566) Me.StatusStrip1.Name = "StatusStrip1" - Me.StatusStrip1.Size = New System.Drawing.Size(1227, 22) + Me.StatusStrip1.Size = New System.Drawing.Size(1199, 22) Me.StatusStrip1.TabIndex = 20 Me.StatusStrip1.Text = "StatusStrip1" ' @@ -437,23 +440,23 @@ Partial Class frmFormDesigner Me.MenuItemAddColumn.Size = New System.Drawing.Size(169, 22) Me.MenuItemAddColumn.Text = "Spalte hinzufügen" ' - 'SplitContainer1 + 'SplitContainerDesigner ' - Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill - Me.SplitContainer1.Location = New System.Drawing.Point(0, 146) - Me.SplitContainer1.Name = "SplitContainer1" + Me.SplitContainerDesigner.Dock = System.Windows.Forms.DockStyle.Fill + Me.SplitContainerDesigner.Location = New System.Drawing.Point(0, 146) + Me.SplitContainerDesigner.Name = "SplitContainerDesigner" ' - 'SplitContainer1.Panel1 + 'SplitContainerDesigner.Panel1 ' - Me.SplitContainer1.Panel1.Controls.Add(Me.pnldesigner) + Me.SplitContainerDesigner.Panel1.Controls.Add(Me.pnldesigner) ' - 'SplitContainer1.Panel2 + 'SplitContainerDesigner.Panel2 ' - Me.SplitContainer1.Panel2.Controls.Add(Me.GroupBox1) - Me.SplitContainer1.Panel2.Controls.Add(Me.TabControlEigenschaften) - Me.SplitContainer1.Size = New System.Drawing.Size(1227, 523) - Me.SplitContainer1.SplitterDistance = 842 - Me.SplitContainer1.TabIndex = 25 + Me.SplitContainerDesigner.Panel2.Controls.Add(Me.Panel1) + Me.SplitContainerDesigner.Panel2.Controls.Add(Me.GroupBox1) + Me.SplitContainerDesigner.Size = New System.Drawing.Size(1199, 420) + Me.SplitContainerDesigner.SplitterDistance = 822 + Me.SplitContainerDesigner.TabIndex = 25 ' 'pnldesigner ' @@ -469,14 +472,14 @@ Partial Class frmFormDesigner 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.Size = New System.Drawing.Size(822, 420) Me.pnldesigner.TabIndex = 3 ' 'Label1 ' Me.Label1.AutoSize = True Me.Label1.ForeColor = System.Drawing.SystemColors.InactiveCaption - Me.Label1.Location = New System.Drawing.Point(30, 40) + Me.Label1.Location = New System.Drawing.Point(30, 20) Me.Label1.Name = "Label1" Me.Label1.Size = New System.Drawing.Size(347, 16) Me.Label1.TabIndex = 6 @@ -487,7 +490,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(30, 30) + Me.lblhintergrund.Location = New System.Drawing.Point(30, 20) Me.lblhintergrund.Name = "lblhintergrund" Me.lblhintergrund.Size = New System.Drawing.Size(248, 29) Me.lblhintergrund.TabIndex = 1 @@ -496,12 +499,12 @@ Partial Class frmFormDesigner '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.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.bbtnItemFinishSQL, Me.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarStaticItem1}) Me.RibbonControl1.Location = New System.Drawing.Point(0, 0) - Me.RibbonControl1.MaxItemId = 4 + Me.RibbonControl1.MaxItemId = 6 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.Size = New System.Drawing.Size(1199, 146) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 ' 'bbtnItemFinishSQL @@ -525,18 +528,42 @@ Partial Class frmFormDesigner Me.BarButtonItem2.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.BarButtonItem2.Name = "BarButtonItem2" ' + 'BarButtonItem3 + ' + Me.BarButtonItem3.Caption = "Designer locked" + Me.BarButtonItem3.Id = 4 + Me.BarButtonItem3.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem3.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem3.ItemAppearance.Normal.BackColor = System.Drawing.Color.Red + Me.BarButtonItem3.ItemAppearance.Normal.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.BarButtonItem3.ItemAppearance.Normal.Options.UseBackColor = True + Me.BarButtonItem3.ItemAppearance.Normal.Options.UseFont = True + Me.BarButtonItem3.Name = "BarButtonItem3" + ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage1.Name = "RibbonPage1" Me.RibbonPage1.Text = "Hintergrundfunktionen" ' 'RibbonPageGroup1 ' Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnItemFinishSQL) + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem3) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" Me.RibbonPageGroup1.Text = "Funktionen" ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 588) + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1199, 21) + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + Me.RibbonPage2.Text = "RibbonPage2" + ' 'RibbonPageGroup2 ' Me.RibbonPageGroup2.ItemLinks.Add(Me.BarButtonItem1) @@ -544,25 +571,33 @@ Partial Class frmFormDesigner Me.RibbonPageGroup2.Name = "RibbonPageGroup2" Me.RibbonPageGroup2.Text = "Control-Funktionen" ' - 'RibbonStatusBar1 + 'BarStaticItem1 ' - 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) + Me.BarStaticItem1.Caption = "Locked" + Me.BarStaticItem1.Id = 5 + Me.BarStaticItem1.ItemAppearance.Normal.Font = New System.Drawing.Font("Tahoma", 20.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.BarStaticItem1.ItemAppearance.Normal.ForeColor = System.Drawing.Color.FromArgb(CType(CType(192, Byte), Integer), CType(CType(0, Byte), Integer), CType(CType(0, Byte), Integer)) + Me.BarStaticItem1.ItemAppearance.Normal.Options.UseFont = True + Me.BarStaticItem1.ItemAppearance.Normal.Options.UseForeColor = True + Me.BarStaticItem1.Name = "BarStaticItem1" + Me.BarStaticItem1.TextAlignment = System.Drawing.StringAlignment.Center ' - 'RibbonPage2 + 'Panel1 ' - Me.RibbonPage2.Name = "RibbonPage2" - Me.RibbonPage2.Text = "RibbonPage2" + Me.Panel1.Controls.Add(Me.TabControlEigenschaften) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel1.Location = New System.Drawing.Point(0, 112) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(373, 308) + Me.Panel1.TabIndex = 23 ' '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, 712) - Me.Controls.Add(Me.SplitContainer1) + Me.ClientSize = New System.Drawing.Size(1199, 609) + Me.Controls.Add(Me.SplitContainerDesigner) Me.Controls.Add(Me.StatusStrip1) Me.Controls.Add(Me.RibbonStatusBar1) Me.Controls.Add(Me.RibbonControl1) @@ -587,13 +622,14 @@ Partial Class frmFormDesigner CType(Me.TBWH_CHECK_PROFILE_CONTROLSBindingSource, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.TBPM_CONTROL_TABLEBindingSource, System.ComponentModel.ISupportInitialize).EndInit() Me.GridControlContextMenu.ResumeLayout(False) - Me.SplitContainer1.Panel1.ResumeLayout(False) - Me.SplitContainer1.Panel2.ResumeLayout(False) - CType(Me.SplitContainer1, System.ComponentModel.ISupportInitialize).EndInit() - Me.SplitContainer1.ResumeLayout(False) + Me.SplitContainerDesigner.Panel1.ResumeLayout(False) + Me.SplitContainerDesigner.Panel2.ResumeLayout(False) + CType(Me.SplitContainerDesigner, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerDesigner.ResumeLayout(False) Me.pnldesigner.ResumeLayout(False) Me.pnldesigner.PerformLayout() CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.Panel1.ResumeLayout(False) Me.ResumeLayout(False) Me.PerformLayout() @@ -634,7 +670,7 @@ Partial Class frmFormDesigner Friend WithEvents btnLine As Button Friend WithEvents GridControlContextMenu As ContextMenuStrip Friend WithEvents MenuItemAddColumn As ToolStripMenuItem - Friend WithEvents SplitContainer1 As SplitContainer + Friend WithEvents SplitContainerDesigner As SplitContainer Friend WithEvents btnButton As Button Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage @@ -644,5 +680,8 @@ Partial Class frmFormDesigner Friend WithEvents bbtnItemFinishSQL As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents Panel1 As Panel + Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem 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 184e344..260a379 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.resx +++ b/app/DD_PM_WINDREAM/frmFormDesigner.resx @@ -243,6 +243,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 451fc06..e645203 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -11,6 +11,7 @@ Public Class frmFormDesigner Public ProfileId As Integer Public ProfileName As String Public ProfileObjectType As String + Public Designer_Locked As Boolean = True ' Control Variables Private CurrentControl As Control = Nothing @@ -33,6 +34,10 @@ Public Class frmFormDesigner Private Sub frmFormDesigner_Load(sender As Object, e As EventArgs) Handles Me.Load Try + + BarButtonItem3.Caption = "Designer locked" + BarButtonItem3.ItemAppearance.Normal.BackColor = Color.Red + Designer_Locked = True ' Setzt den typ des SQL-Befehls für frmSQL_DESIGNER CURRENT_DESIGN_TYPE = "INPUT_INDEX" @@ -660,6 +665,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() @@ -1180,4 +1188,18 @@ Public Class frmFormDesigner Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick LoadControls() End Sub + + Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick + If BarButtonItem3.Caption = "Designer locked" Then + + BarButtonItem3.Caption = "Designer active" + BarButtonItem3.ItemAppearance.Normal.BackColor = Color.Lime + Designer_Locked = False + Else + + BarButtonItem3.Caption = "Designer locked" + BarButtonItem3.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/frmMain.vb b/app/DD_PM_WINDREAM/frmMain.vb index f122489..688fa02 100644 --- a/app/DD_PM_WINDREAM/frmMain.vb +++ b/app/DD_PM_WINDREAM/frmMain.vb @@ -191,25 +191,30 @@ Public Class frmMain If IDB_ACTIVE = False And ERROR_STATE = "" Then Try - WINDREAM.Start_WMCC_andCo() - If Not IsNothing(WINDREAM.oSession) Then - If WINDREAM.oSession.aLoggedin = False Then - MsgBox("You could not be logged in to windream. Please check the log.", MsgBoxStyle.Critical) + If Init_windream() = True Then + WINDREAM.Start_WMCC_andCo() + If Not IsNothing(WINDREAM.oSession) Then + If WINDREAM.oSession.aLoggedin = False Then + MsgBox("You could not be logged in to windream. Please check the log.", MsgBoxStyle.Critical) + End If + Else + MsgBox("Login on windream was not possible. Please check the log.", MsgBoxStyle.Critical) End If - Else - MsgBox("Login on windream was not possible. Please check the log.", MsgBoxStyle.Critical) End If - '_windreamPM = New ClassPMWindream - '_windreamPM.Start_WMCC_andCo() + Catch ex As Exception LOGGER.Error(ex) MsgBox("Unexpected Error in windream-login - Step 5: " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") End Try Else - Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'PM_IDB_DOC_DATA'" - IDB_DOC_DATA_SQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) - LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}") + SOURCE_INIT = Init_IDB() + If SOURCE_INIT = True Then + Dim oSQL = $"SELECT SQL_COMMAND FROM TBDD_SQL_COMMANDS WHERE TITLE = 'PM_IDB_DOC_DATA'" + IDB_DOC_DATA_SQL = ClassDatabase.Execute_Scalar(oSQL, CONNECTION_STRING) + LOGGER.Debug($"Got the IDB_DOC_DATA_SQL..{IDB_DOC_DATA_SQL}") + End If + End If @@ -1097,9 +1102,7 @@ Public Class frmMain WINDREAM = New ClassPMWindream() WINDREAM.Create_Session() WINDREAM_ALLG = New ClassWindream_allgemein - - LOGGER.Debug("windream initialized") - Return True + Return WINDREAM.IsLoggedIn Catch ex As Exception LOGGER.Error(ex) MsgBox("Error Init_windream:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Attention:") @@ -1133,12 +1136,6 @@ Public Class frmMain Exit Sub End If - If IDB_ACTIVE = False Then - SOURCE_INIT = Init_windream() - Else - SOURCE_INIT = Init_IDB() - End If - If SOURCE_INIT = True Then diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 5e05ae0..2239d94 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -1704,8 +1704,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