Prepare for WISAG

This commit is contained in:
Jonathan Jenne
2019-04-29 16:18:04 +02:00
parent bc3574dcff
commit 963105669a
13 changed files with 1051 additions and 479 deletions

View File

@@ -241,7 +241,7 @@ Public Class frmFormDesigner
End Try
End Sub
Private Sub DragDropButtons_MouseDown(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseDown, btntextbox.MouseDown, btncmb.MouseDown, btndtp.MouseDown, btnVektor.MouseDown, btnTabelle.MouseDown, btnCheckbox.MouseDown, btnLine.MouseDown
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
Mouse_IsPressed = True
CurrentControl = Nothing
@@ -252,7 +252,7 @@ Public Class frmFormDesigner
End Try
End Sub
Private Sub DragDropButtons_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove, btntextbox.MouseMove, btncmb.MouseMove, btndtp.MouseMove, btnVektor.MouseMove, btnTabelle.MouseMove, btnCheckbox.MouseMove, btnLine.MouseMove
Private Sub DragDropButtons_MouseMove(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseMove, btntextbox.MouseMove, btndtp.MouseMove, btnVektor.MouseMove, btnTabelle.MouseMove, btnCheckbox.MouseMove, btnLine.MouseMove
If Mouse_IsPressed Then
Dim btn As Button = sender
Dim dragDropData As String
@@ -280,7 +280,7 @@ Public Class frmFormDesigner
End If
End Sub
Private Sub DragDropButtons_MouseUp(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseUp, btntextbox.MouseUp, btncmb.MouseUp, btndtp.MouseUp, btnVektor.MouseUp, btnTabelle.MouseUp, btnCheckbox.MouseUp, btnLine.MouseUp
Private Sub DragDropButtons_MouseUp(sender As Object, e As MouseEventArgs) Handles btnlabel.MouseUp, btntextbox.MouseUp, btndtp.MouseUp, btnVektor.MouseUp, btnTabelle.MouseUp, btnCheckbox.MouseUp, btnLine.MouseUp
Mouse_IsPressed = False
End Sub
@@ -757,6 +757,7 @@ Public Class frmFormDesigner
ElseIf TypeOf sender Is TextBox Then
Dim txt As TextBox = sender
Dim txtProps As TextboxProperties = CreatePropsObjectWithIndicies(New TextboxProperties, row, Windream_AllIndicies)
txtProps.Regex = NotNull(row.Item("REGEX_MATCH"), String.Empty)
props = txtProps
@@ -764,7 +765,7 @@ Public Class frmFormDesigner
Dim cmb As ComboBox = sender
Dim cmbProps As ComboboxProperties = CreatePropsObjectWithIndicies(New ComboboxProperties, row, Windream_AllIndicies)
cmbProps.ChoiceLists = Windream_ChoiceLists
cmbProps.ChoiceList = NotNull(row.Item("CHOICE_LIST"), "")
cmbProps.ChoiceList = NotNull(row.Item("CHOICE_LIST"), String.Empty)
props = cmbProps
@@ -893,6 +894,9 @@ Public Class frmFormDesigner
Case "DefaultValue"
UpdateSingleValue("DEFAULT_VALUE", newValue)
Case "Regex"
UpdateSingleValue("REGEX_MATCH", newValue)
End Select
End Sub