Zooflow/SQLEditor: include clipboard ,small fixes

This commit is contained in:
Jonathan Jenne
2022-05-09 16:33:19 +02:00
parent 77a7cb4d75
commit 61b2b25f7e
4 changed files with 46 additions and 16 deletions

View File

@@ -17,6 +17,7 @@ Public Class frmSQLEditor
Public Property SQLCommand As String = ""
Public Property SQLConnection As Integer = 0
Public Property LoadClipboardPlaceholders As Boolean = False
Public Property PlaceholdersManual As List(Of String)
Public Property PlaceholdersAutomatic As List(Of String)
@@ -87,12 +88,26 @@ Public Class frmSQLEditor
End Sub
Private Function LoadPlaceholders() As List(Of GalleryItemGroup)
Return New List(Of GalleryItemGroup)() From {
Placeholders.GetInternalGroup(),
Placeholders.GetUserGroup(),
Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic),
Placeholders.GetManualPlaceholders(PlaceholdersManual)
Dim oPlaceholders = New List(Of GalleryItemGroup)() From {
Placeholders.GetInternalPlaceholders(),
Placeholders.GetUserGroup()
}
Dim oAutomaticAttributes = Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic)
If oAutomaticAttributes IsNot Nothing Then
oPlaceholders.Add(oAutomaticAttributes)
End If
Dim oManualPlaceholders = Placeholders.GetManualPlaceholders(PlaceholdersManual)
If oManualPlaceholders IsNot Nothing Then
oPlaceholders.Add(oManualPlaceholders)
End If
If LoadClipboardPlaceholders Then
oPlaceholders.Add(Placeholders.GetClipboardPlaceholder)
End If
Return oPlaceholders
End Function
Private Function LoadConnections() As GalleryItemGroup
@@ -176,8 +191,9 @@ Public Class frmSQLEditor
Private Sub ExecuteSQL()
Try
Dim oSql = txtSQLCommand.Document.Text
ViewPlaceholders.FocusInvalidRow()
Dim oSql = txtSQLCommand.Document.Text
Dim oPlaceholders As List(Of Placeholder) = GridPlaceholders.DataSource
If oPlaceholders IsNot Nothing Then