From a3a0a02b6edf93034f1ee36b2274bebe27a10086 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 14 Jul 2022 16:23:07 +0200 Subject: [PATCH 1/3] Add Controls to SQLEditor placeholders --- app/DD_PM_WINDREAM/ClassSQLEditor.vb | 4 ++++ app/DD_PM_WINDREAM/My Project/licenses.licx | 13 +++++++------ app/DD_PM_WINDREAM/frmFormDesigner.vb | 2 ++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/DD_PM_WINDREAM/ClassSQLEditor.vb b/app/DD_PM_WINDREAM/ClassSQLEditor.vb index 88c08d6..fff9ccb 100644 --- a/app/DD_PM_WINDREAM/ClassSQLEditor.vb +++ b/app/DD_PM_WINDREAM/ClassSQLEditor.vb @@ -20,6 +20,10 @@ Public Class ClassSQLEditor Using oForm As New frmSQLEditor(LOGCONFIG, DatabaseECM) oForm.SQLCommand = SQLSTring + oForm.PlaceholdersManualPrefix = "CTRL" + oForm.PlaceholdersManualTitle = "Controls" + oForm.PlaceholdersManual = CURRENT_CONTROL_LIST.ToDictionary(Function(control) control.Name, Function(control) control.Name) + If svc.ShowDialog(oForm) = DialogResult.OK Then Dim sql As New SQLValue(oForm.SQLCommand) CURRENT_SQL_CON = oForm.SQLConnection diff --git a/app/DD_PM_WINDREAM/My Project/licenses.licx b/app/DD_PM_WINDREAM/My Project/licenses.licx index 41c69df..b93fedb 100644 --- a/app/DD_PM_WINDREAM/My Project/licenses.licx +++ b/app/DD_PM_WINDREAM/My Project/licenses.licx @@ -1,10 +1,11 @@ -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.CheckEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraNavBar.NavBarControl, DevExpress.XtraNavBar.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraVerticalGrid.PropertyGridControl, DevExpress.XtraVerticalGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD_PM_WINDREAM/frmFormDesigner.vb b/app/DD_PM_WINDREAM/frmFormDesigner.vb index 9139193..ae8478d 100644 --- a/app/DD_PM_WINDREAM/frmFormDesigner.vb +++ b/app/DD_PM_WINDREAM/frmFormDesigner.vb @@ -292,6 +292,8 @@ Public Class frmFormDesigner SetMovementHandlers(oButton) End Select Next + + CURRENT_CONTROL_LIST = pnldesigner.Controls.Cast(Of Control).ToList() Catch ex As Exception LOGGER.Error(ex) MsgBox("Fehler bei LoadControls " & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Achtung:") From 8664500877847a3d68004696beea00bd5dd4cda4 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 14 Jul 2022 16:23:43 +0200 Subject: [PATCH 2/3] revert readonly processing --- app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb | 1 + app/DD_PM_WINDREAM/frmValidator.vb | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb index 407cd92..cbd8c7c 100644 --- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb +++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb @@ -130,6 +130,7 @@ Module ModuleRuntimeVariables Public Property CURRENT_DT_PROFILES As DataTable Public Property CURRENT_DT_PROFILE As DataTable + Public Property CURRENT_CONTROL_LIST As New List(Of Control) Public CURRENT_INDEX_ARRAY(100, 250) As String diff --git a/app/DD_PM_WINDREAM/frmValidator.vb b/app/DD_PM_WINDREAM/frmValidator.vb index 488eea3..d89f346 100644 --- a/app/DD_PM_WINDREAM/frmValidator.vb +++ b/app/DD_PM_WINDREAM/frmValidator.vb @@ -4410,10 +4410,10 @@ Public Class frmValidator Dim oSQLCheckCommand As String = IIf(IsDBNull(oControlRow.Item("SQL_UEBERPRUEFUNG")), "", oControlRow.Item("SQL_UEBERPRUEFUNG")) Dim oIsReadOnly As Boolean = CBool(oControlRow.Item("READ_ONLY")) - ' WARUM HABEN SIE GEMACHT????!!!!!!einself11 - 'If oIsReadOnly = True Then - ' Continue For - 'End If + ' Readonly felder werden über finale indexe gefüllt, nicht mit SetControlData + If oIsReadOnly = True Then + Continue For + End If Dim oControlType As String = oControlRow.Item("CTRL_TYPE") Dim oIDBTyp As Integer From d58cb3f71480f7556636d582d7f37945b1d47334 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 15 Jul 2022 09:19:13 +0200 Subject: [PATCH 3/3] Version 2.3.7.10 --- app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb index b8c2fe1..70408dc 100644 --- a/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb +++ b/app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb @@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices - + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - +