diff --git a/GUIs.Common/frmSQLEditor.Designer.vb b/GUIs.Common/frmSQLEditor.Designer.vb index 96e7850b..3fe98747 100644 --- a/GUIs.Common/frmSQLEditor.Designer.vb +++ b/GUIs.Common/frmSQLEditor.Designer.vb @@ -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.ShowGroupCaption = True Me.GalleryPlaceholders.Gallery.ShowItemText = True Me.GalleryPlaceholders.Id = 1 Me.GalleryPlaceholders.Name = "GalleryPlaceholders" @@ -259,7 +258,7 @@ Partial Class frmSQLEditor ' '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.MainView = Me.ViewPlaceholders Me.GridPlaceholders.MenuManager = Me.RibbonControl1 diff --git a/GUIs.Common/frmSQLEditor.resx b/GUIs.Common/frmSQLEditor.resx index db05aee5..49b40652 100644 --- a/GUIs.Common/frmSQLEditor.resx +++ b/GUIs.Common/frmSQLEditor.resx @@ -136,7 +136,4 @@ LDQgIGw0LTRsMywzbC00LDRMMjMsMjB6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw== - - 17, 17 - \ No newline at end of file diff --git a/GUIs.Common/frmSQLEditor.vb b/GUIs.Common/frmSQLEditor.vb index aa6dafee..88ba5929 100644 --- a/GUIs.Common/frmSQLEditor.vb +++ b/GUIs.Common/frmSQLEditor.vb @@ -106,10 +106,7 @@ Public Class frmSQLEditor End Sub Private Function LoadPlaceholders() As List(Of GalleryItemGroup) - Dim oPlaceholders = New List(Of GalleryItemGroup)() From { - Placeholders.GetInternalPlaceholders(), - Placeholders.GetUserPlaceholders() - } + Dim oPlaceholders = New List(Of GalleryItemGroup)() Dim oAutomaticAttributes = Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic, PlaceholdersAutomaticPrefix, PlaceholdersAutomaticTitle) If oAutomaticAttributes IsNot Nothing Then @@ -130,6 +127,9 @@ Public Class frmSQLEditor oPlaceholders.Add(Placeholders.GetClipboardPlaceholder) End If + oPlaceholders.Add(Placeholders.GetUserPlaceholders()) + oPlaceholders.Add(Placeholders.GetInternalPlaceholders()) + Return oPlaceholders End Function