From 329f733ec952f01d978911f286c09713d655ac67 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Mon, 18 Aug 2025 11:51:56 +0200 Subject: [PATCH] =?UTF-8?q?=C3=9Cberarbeitung=20nach=20R=C3=BCckmeldung=20?= =?UTF-8?q?Marvin=20(windreamIndexe=20SQL=20Editor,=20Dynmisch=20verkleine?= =?UTF-8?q?rn=20des=20pnlValidators,=20Regexpr=C3=BCfung=20editvalue,=20Be?= =?UTF-8?q?dienung=20Tastaturbefehle,=20...)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/SetupVS19/Product.wxs | 7 +- app/TaskFlow/ClassWindream_allgemein.vb | 3 +- app/TaskFlow/frmAdministration.vb | 9 +- app/TaskFlow/frmFormDesigner.vb | 46 ++++++-- app/TaskFlow/frmValidator.resx | 138 ++++++++++++------------ app/TaskFlow/frmValidator.vb | 6 +- 6 files changed, 121 insertions(+), 88 deletions(-) diff --git a/app/SetupVS19/Product.wxs b/app/SetupVS19/Product.wxs index 5eea3d6..7352f81 100644 --- a/app/SetupVS19/Product.wxs +++ b/app/SetupVS19/Product.wxs @@ -154,7 +154,7 @@ - + @@ -166,7 +166,10 @@ - + + + + diff --git a/app/TaskFlow/ClassWindream_allgemein.vb b/app/TaskFlow/ClassWindream_allgemein.vb index 472640c..27cf4f3 100644 --- a/app/TaskFlow/ClassWindream_allgemein.vb +++ b/app/TaskFlow/ClassWindream_allgemein.vb @@ -359,13 +359,14 @@ LOGGER.Error(ex) Dim indexnamen() As String = Me.GetIndicesByObjecttype(objekttyp) If indexnamen Is Nothing Then Return False + MVSource_AllIndicies = MyIndicies For Each index As String In indexnamen If index = indexname Then Return True Next Catch ex As Exception -LOGGER.Error(ex) + LOGGER.Error(ex) MsgBox("Beim Prüfen ob ein Index für einen Objekttypen existiert, ist ein Fehler aufgetreten." & vbNewLine & vbNewLine & "Fehlernachricht:" & vbNewLine & ex.Message, MsgBoxStyle.Critical, "Fehler beim Prüfen auf Existenz eines Index in einem Objekttyp") End Try diff --git a/app/TaskFlow/frmAdministration.vb b/app/TaskFlow/frmAdministration.vb index dee0480..e42c9cb 100644 --- a/app/TaskFlow/frmAdministration.vb +++ b/app/TaskFlow/frmAdministration.vb @@ -113,7 +113,7 @@ Public Class frmAdministration MyIndicies_Types = New List(Of Integer) MyIndicies = New List(Of String) MyIndicies = WINDREAM.GetIndicesByObjecttype(cmbObjekttypen.Text).ToList() - + MVSource_AllIndicies = MyIndicies If MyIndicies IsNot Nothing Then Dim i As Integer = 0 @@ -1235,6 +1235,13 @@ Public Class frmAdministration .PlaceholdersManualTitle = "Controls", .PlaceholdersManual = CURRENT_CONTROL_NAME_LIST.ToDictionary(Function(name) name, Function(name) name) } + + If IDB_ACTIVE = False Then + oForm.ATTRIBUTE_STORE = "WM" + oForm.PlaceholdersWindream = MVSource_AllIndicies + Else + oForm.ATTRIBUTE_STORE = "IDB" + End If oForm.ShowDialog() If oForm.DialogResult = DialogResult.OK Then diff --git a/app/TaskFlow/frmFormDesigner.vb b/app/TaskFlow/frmFormDesigner.vb index 5450f0a..b0a6720 100644 --- a/app/TaskFlow/frmFormDesigner.vb +++ b/app/TaskFlow/frmFormDesigner.vb @@ -39,6 +39,7 @@ Public Class frmFormDesigner Private Source_LookupIndicies As List(Of String) Private CurrentColumnId As Integer = 0 + Private pgControls_Focused As Boolean = False Public Sub Reload_ControlNameList() _Logger.debug("Reloading control name list") @@ -474,7 +475,7 @@ Public Class frmFormDesigner Exit Sub End If Mouse_IsPressed = False - If TypeOf sender Is LookupControl3 Then + If (TypeOf sender Is LookupControl3 Or TypeOf sender Is Windows.Forms.ComboBox) Then RibPGCtrlheight.Enabled = False Else RibPGCtrlheight.Enabled = True @@ -773,7 +774,7 @@ Public Class frmFormDesigner If e.ChangeType <> DevExpress.XtraVerticalGrid.RowChangeTypeEnum.Value Then Exit Sub End If - + pgControls_Focused = True Dim prop = e.Properties.FieldName Dim newValue = e.Properties.Value @@ -1304,7 +1305,8 @@ Public Class frmFormDesigner Height_minus() Else Console.WriteLine("e.keycode: " + e.KeyCode.ToString) - If e.KeyCode = e.KeyCode.Delete Then + If e.KeyCode = e.KeyCode.Delete And pgControls_Focused = False Then + Control_Delete() ElseIf e.KeyCode = e.KeyCode.F5 Then LoadControls() @@ -1351,23 +1353,20 @@ Public Class frmFormDesigner If CurrentControl Is Nothing = False Then Dim newHeight As Integer = CurrentControl.Height - 5 Dim oReloadNeeded As Boolean = False - If newHeight < 22 And TypeOf CurrentControl Is DevExpress.XtraEditors.MemoEdit Then + If newHeight <= 22 And TypeOf CurrentControl Is DevExpress.XtraEditors.MemoEdit Then oReloadNeeded = True ' DirectCast(CurrentControl, TextBox).Multiline = True - End If - - ' Verhindert, dass das Control unsichtbar wird - If newHeight < 1 Then + ElseIf newHeight <= 20 Then Exit Sub End If - CurrentControl.Size = New Size(CurrentControl.Width, newHeight) DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size pgControlsNew.UpdateData() If UpdateSingleValue("HEIGHT", newHeight) And oReloadNeeded Then LoadControls() + LoadControlProperties(CurrentControl) End If End If End Sub @@ -1384,13 +1383,38 @@ Public Class frmFormDesigner End If CurrentControl.Size = New Size(CurrentControl.Width, newHeight) - DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size - pgControlsNew.UpdateData() + DirectCast(pgControlsNew.SelectedObject, BaseProperties).Size = CurrentControl.Size + pgControlsNew.UpdateData() If UpdateSingleValue("HEIGHT", newHeight) And oReloadNeeded Then LoadControls() + CurrentControl.Select() + CurrentControl.BackColor = Color.Orange End If End If End Sub + Private Sub pgControlsNew_KeyPress(sender As Object, e As KeyPressEventArgs) Handles pgControlsNew.KeyPress + pgControls_Focused = True + End Sub + + Private Sub pgControlsNew_Leave(sender As Object, e As EventArgs) Handles pgControlsNew.Leave + pgControls_Focused = False + End Sub + + Private Sub pgControlsNew_KeyUp(sender As Object, e As KeyEventArgs) Handles pgControlsNew.KeyUp + pgControls_Focused = True + End Sub + + Private Sub pgControlsNew_Click(sender As Object, e As EventArgs) Handles pgControlsNew.Click + pgControls_Focused = True + End Sub + + Private Sub pgControlsNew_GotFocus(sender As Object, e As EventArgs) Handles pgControlsNew.GotFocus + pgControls_Focused = True + End Sub + + Private Sub pgControlsNew_Enter(sender As Object, e As EventArgs) Handles pgControlsNew.Enter + pgControls_Focused = True + End Sub End Class \ No newline at end of file diff --git a/app/TaskFlow/frmValidator.resx b/app/TaskFlow/frmValidator.resx index dea40d1..206b02b 100644 --- a/app/TaskFlow/frmValidator.resx +++ b/app/TaskFlow/frmValidator.resx @@ -477,10 +477,10 @@ Segoe UI, 8.25pt - 6, 80 + 6, 58 - 642, 203 + 642, 225 3 @@ -511,7 +511,7 @@ 6, 33 - 643, 46 + 643, 26 1 @@ -1266,39 +1266,6 @@ 0, 0 - - Datei - - - Daten - - - Aktionen - - - Hinweise - - - Anhänge - - - Anhänge zu Beleg - - - - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAASZJREFUWEfN - l7ERwjAMRZmAinFeT8cMDMAgbENLyRZ0dKxAG+5zhAuKBDYOiOLd5YykPBJbdmZd180yGQ38mscF8I45 - sAK2wB44AZc7utaYflOMYm3+EzUCC2ADHICuEMUqR7m2XpXAEtg5NyhFuaph6xYJrIGjU7QW1VCtKgEl - nJ1in6JaTxKvBPTIpvjnFtV8vI5IQJOm5Z2/Q7VvEzMS0My1SVOje7gCWrvFS63PG+SPYgJ0j7knoAZi - g0MaBMTKE1AXs4EhjQJbT0Ct1AaGNArsPQH1cxsY0ihw8gS0qdjAkEaBy18KpL+C9EmYvgyrGlEjbiNK - b8WieDNqEAg3I5G+HYvUA0lP6pFsKDHFk/joUNqTeizvSf0wGfLdT7MsRgO/5go/tJcKezdCSgAAAABJ - RU5ErkJggg== - - - - Information - Start @@ -2194,6 +2161,39 @@ Zoom + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu + NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE + ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi + bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s + VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw + BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh + bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl + bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF + eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA + Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs + dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz + cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z + CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl + c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA + AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN + QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs + b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT + eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp + b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg + Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ + dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k + ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl + c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E + cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz + LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO + AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL + + 10 % @@ -2236,39 +2236,6 @@ sichtbare einpassen - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFpEZXZFeHByZXNzLlV0aWxzLnYyMS4yLCBWZXJzaW9uPTIxLjIu - NC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI4OGQxNzU0ZDcwMGU0OWEMAwAAAFlE - ZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVi - bGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29s - VGlwBwAAAA1BbGxvd0h0bWxUZXh0EUZpeGVkVG9vbFRpcFdpZHRoCkl0ZW1zQ291bnQJaXRlbVR5cGUw - BWl0ZW0wCWl0ZW1UeXBlMQVpdGVtMQQAAAQEBAQfRGV2RXhwcmVzcy5VdGlscy5EZWZhdWx0Qm9vbGVh - bgMAAAABCCVEZXZFeHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAgAAACFEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBUaXRsZUl0ZW0CAAAAJURldkV4cHJlc3MuVXRpbHMuU3VwZXJUb29sVGlwSXRl - bVR5cGUCAAAAHERldkV4cHJlc3MuVXRpbHMuVG9vbFRpcEl0ZW0CAAAAAgAAAAX8////H0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4BAAAAB3ZhbHVlX18ACAMAAAACAAAAAAIAAAAF+////yVEZXZF - eHByZXNzLlV0aWxzLlN1cGVyVG9vbFRpcEl0ZW1UeXBlAQAAAAd2YWx1ZV9fAAgCAAAAAQAAAAkGAAAA - Afn////7////AAAAAAkIAAAADAkAAABRU3lzdGVtLkRyYXdpbmcsIFZlcnNpb249NC4wLjAuMCwgQ3Vs - dHVyZT1uZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iMDNmNWY3ZjExZDUwYTNhBQYAAAAhRGV2RXhwcmVz - cy5VdGlscy5Ub29sVGlwVGl0bGVJdGVtBwAAAA1BbGxvd0h0bWxUZXh0BEljb24MSW1hZ2VPcHRpb25z - CkxlZnRJbmRlbnQITWF4V2lkdGgST3duZXJBbGxvd0h0bWxUZXh0BFRleHQEBAQAAAABH0RldkV4cHJl - c3MuVXRpbHMuRGVmYXVsdEJvb2xlYW4DAAAAE1N5c3RlbS5EcmF3aW5nLkljb24JAAAAKERldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEl0ZW1JbWFnZU9wdGlvbnMCAAAACAgBAgAAAAH2/////P///wIAAAAKCQsA - AAAAAAAAPAEAAAAGDAAAAARab29tBQgAAAAcRGV2RXhwcmVzcy5VdGlscy5Ub29sVGlwSXRlbQcAAAAN - QWxsb3dIdG1sVGV4dARJY29uDEltYWdlT3B0aW9ucwpMZWZ0SW5kZW50CE1heFdpZHRoEk93bmVyQWxs - b3dIdG1sVGV4dARUZXh0BAQEAAAAAR9EZXZFeHByZXNzLlV0aWxzLkRlZmF1bHRCb29sZWFuAwAAABNT - eXN0ZW0uRHJhd2luZy5JY29uCQAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJdGVtSW1hZ2VPcHRp - b25zAgAAAAgIAQIAAAAB8/////z///8CAAAACgkOAAAAAAAAADwBAAAABg8AAAApw4RuZGVybiBkZXIg - Wm9vbS1TdHVmZSBkZXMgUERGLURva3VtZW50cy4FCwAAAChEZXZFeHByZXNzLlV0aWxzLlRvb2xUaXBJ - dGVtSW1hZ2VPcHRpb25zBQAAAAhJbWFnZVVyaQxTdmdJbWFnZVNpemUJQWxpZ25tZW50CkltYWdlSW5k - ZXgTSW1hZ2VUb1RleHREaXN0YW5jZQEEBAAAE1N5c3RlbS5EcmF3aW5nLlNpemUJAAAAJkRldkV4cHJl - c3MuVXRpbHMuVG9vbFRpcEltYWdlQWxpZ25tZW50AgAAAAgIAgAAAAYQAAAAAAXv////E1N5c3RlbS5E - cmF3aW5nLlNpemUCAAAABXdpZHRoBmhlaWdodAAACAgJAAAAAAAAAAAAAAAF7v///yZEZXZFeHByZXNz - LlV0aWxzLlRvb2xUaXBJbWFnZUFsaWdubWVudAEAAAAHdmFsdWVfXwAIAgAAAAAAAAD/////DgAAAAEO - AAAACwAAAAkQAAAAAe3////v////AAAAAAAAAAAB7P///+7///8AAAAA/////w4AAAAL - - BarButtonItem1 @@ -2287,6 +2254,39 @@ 232, 128 + + Datei + + + Daten + + + Aktionen + + + Hinweise + + + Anhänge + + + Anhänge zu Beleg + + + + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAALdEVYdFRpdGxlAEluZm87bRIthgAAASZJREFUWEfN + l7ERwjAMRZmAinFeT8cMDMAgbENLyRZ0dKxAG+5zhAuKBDYOiOLd5YykPBJbdmZd180yGQ38mscF8I45 + sAK2wB44AZc7utaYflOMYm3+EzUCC2ADHICuEMUqR7m2XpXAEtg5NyhFuaph6xYJrIGjU7QW1VCtKgEl + nJ1in6JaTxKvBPTIpvjnFtV8vI5IQJOm5Z2/Q7VvEzMS0My1SVOje7gCWrvFS63PG+SPYgJ0j7knoAZi + g0MaBMTKE1AXs4EhjQJbT0Ct1AaGNArsPQH1cxsY0ihw8gS0qdjAkEaBy18KpL+C9EmYvgyrGlEjbiNK + b8WieDNqEAg3I5G+HYvUA0lP6pFsKDHFk/joUNqTeizvSf0wGfLdT7MsRgO/5go/tJcKezdCSgAAAABJ + RU5ErkJggg== + + + + Information + RibbonPage2 diff --git a/app/TaskFlow/frmValidator.vb b/app/TaskFlow/frmValidator.vb index 0bcbbe1..00fd94a 100644 --- a/app/TaskFlow/frmValidator.vb +++ b/app/TaskFlow/frmValidator.vb @@ -334,8 +334,6 @@ Public Class frmValidator TITLELabel1.Text = oProfileTitle Dim opnlPoint As New Point(8, 132) If oProfileDescription <> String.Empty Then - - 'PanelValidatorControl.Location = opnlPoint DESCRIPTIONLabel.Text = oProfileDescription Else DESCRIPTIONLabel.Visible = False @@ -4943,10 +4941,10 @@ Public Class frmValidator Try 'Dim oWrongInputMessage = ClassAllgemeineFunktionen.GUI_LANGUAGE_INFO("frmValidator.WrongInputControl") Dim oWrongInputMessage = S.Falsche_Eingabe - + Dim oDevexpressTextEdit As DevExpress.XtraEditors.TextEdit = oControl MyValidationLogger.Debug("Validating Textbox..") - If oRegexMatch <> String.Empty AndAlso Not Regex.IsMatch(oControl.Text, oRegexMatch) Then + If oRegexMatch <> String.Empty AndAlso Not Regex.IsMatch(oDevexpressTextEdit.EditValue, oRegexMatch) Then oMissing = True oErrMsgMissingInput = oWrongInputMessage & " textbox '" & oControl.Name & "'"