Common/SQLEditor: reverse placeholder order, remove placeholder title bar

This commit is contained in:
Jonathan Jenne 2022-07-15 09:35:34 +02:00
parent ad3de3caa6
commit 8e47ba31e7
3 changed files with 6 additions and 10 deletions

View File

@ -84,9 +84,8 @@ Partial Class frmSQLEditor
' '
' '
' '
Me.GalleryPlaceholders.Gallery.ColumnCount = 4 Me.GalleryPlaceholders.Gallery.ColumnCount = 6
Me.GalleryPlaceholders.Gallery.Images = Me.SvgImageCollection1 Me.GalleryPlaceholders.Gallery.Images = Me.SvgImageCollection1
Me.GalleryPlaceholders.Gallery.ShowGroupCaption = True
Me.GalleryPlaceholders.Gallery.ShowItemText = True Me.GalleryPlaceholders.Gallery.ShowItemText = True
Me.GalleryPlaceholders.Id = 1 Me.GalleryPlaceholders.Id = 1
Me.GalleryPlaceholders.Name = "GalleryPlaceholders" Me.GalleryPlaceholders.Name = "GalleryPlaceholders"
@ -259,7 +258,7 @@ Partial Class frmSQLEditor
' '
'GridPlaceholders 'GridPlaceholders
' '
Me.GridPlaceholders.Anchor = System.Windows.Forms.AnchorStyles.Right Me.GridPlaceholders.Dock = System.Windows.Forms.DockStyle.Fill
Me.GridPlaceholders.Location = New System.Drawing.Point(0, 0) Me.GridPlaceholders.Location = New System.Drawing.Point(0, 0)
Me.GridPlaceholders.MainView = Me.ViewPlaceholders Me.GridPlaceholders.MainView = Me.ViewPlaceholders
Me.GridPlaceholders.MenuManager = Me.RibbonControl1 Me.GridPlaceholders.MenuManager = Me.RibbonControl1

View File

@ -136,7 +136,4 @@
LDQgIGw0LTRsMywzbC00LDRMMjMsMjB6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== LDQgIGw0LTRsMywzbC00LDRMMjMsMjB6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
</value> </value>
</data> </data>
<metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root> </root>

View File

@ -106,10 +106,7 @@ Public Class frmSQLEditor
End Sub End Sub
Private Function LoadPlaceholders() As List(Of GalleryItemGroup) Private Function LoadPlaceholders() As List(Of GalleryItemGroup)
Dim oPlaceholders = New List(Of GalleryItemGroup)() From { Dim oPlaceholders = New List(Of GalleryItemGroup)()
Placeholders.GetInternalPlaceholders(),
Placeholders.GetUserPlaceholders()
}
Dim oAutomaticAttributes = Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic, PlaceholdersAutomaticPrefix, PlaceholdersAutomaticTitle) Dim oAutomaticAttributes = Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic, PlaceholdersAutomaticPrefix, PlaceholdersAutomaticTitle)
If oAutomaticAttributes IsNot Nothing Then If oAutomaticAttributes IsNot Nothing Then
@ -130,6 +127,9 @@ Public Class frmSQLEditor
oPlaceholders.Add(Placeholders.GetClipboardPlaceholder) oPlaceholders.Add(Placeholders.GetClipboardPlaceholder)
End If End If
oPlaceholders.Add(Placeholders.GetUserPlaceholders())
oPlaceholders.Add(Placeholders.GetInternalPlaceholders())
Return oPlaceholders Return oPlaceholders
End Function End Function