SQLEditor: Improve editor, add support for connections

2022-05-06 15:48:32 +02:00
parent ae6edf4fce
commit 24fb1f00bc
8 changed files with 190 additions and 73 deletions
--- a/Controls.SQLEditor/frmSQLEditor.Designer.vb
+++ b/Controls.SQLEditor/frmSQLEditor.Designer.vb
@@ -24,21 +24,22 @@ Partial Class frmSQLEditor
    Private Sub InitializeComponent()
        Me.components = New System.ComponentModel.Container()
        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
-        Me.RibbonGalleryBarItem1 = New DevExpress.XtraBars.RibbonGalleryBarItem()
+        Me.GalleryPlaceholders = New DevExpress.XtraBars.RibbonGalleryBarItem()
        Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
        Me.btnEditConnections = New DevExpress.XtraBars.BarButtonItem()
        Me.btnSave = New DevExpress.XtraBars.BarButtonItem()
        Me.btnExecuteSQL = New DevExpress.XtraBars.BarButtonItem()
-        Me.RibbonGalleryBarItem2 = New DevExpress.XtraBars.RibbonGalleryBarItem()
+        Me.GalleryConnection = New DevExpress.XtraBars.RibbonGalleryBarItem()
        Me.chkClearPlaceholders = New DevExpress.XtraBars.BarCheckItem()
        Me.btnClearPlaceholders = New DevExpress.XtraBars.BarButtonItem()
+        Me.chkShowPlaceholders = New DevExpress.XtraBars.BarCheckItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
-        Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
+        Me.txtSQLCommand = New DevExpress.XtraRichEdit.RichEditControl()
        Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
        Me.GridPlaceholders = New DevExpress.XtraGrid.GridControl()
        Me.ViewPlaceholders = New DevExpress.XtraGrid.Views.Grid.GridView()
@@ -59,25 +60,26 @@ Partial Class frmSQLEditor
        'RibbonControl1
        '
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.RibbonGalleryBarItem1, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL, Me.RibbonGalleryBarItem2, Me.chkClearPlaceholders, Me.btnClearPlaceholders})
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.GalleryPlaceholders, Me.btnEditConnections, Me.btnSave, Me.btnExecuteSQL, Me.GalleryConnection, Me.chkClearPlaceholders, Me.btnClearPlaceholders, Me.chkShowPlaceholders})
        Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 11
+        Me.RibbonControl1.MaxItemId = 13
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
+        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.Size = New System.Drawing.Size(1056, 158)
        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        '
-        'RibbonGalleryBarItem1
+        'GalleryPlaceholders
        '
-        Me.RibbonGalleryBarItem1.Caption = "RibbonGalleryBarItem1"
+        Me.GalleryPlaceholders.Caption = "RibbonGalleryBarItem1"
        '
        '
        '
-        Me.RibbonGalleryBarItem1.Gallery.Images = Me.SvgImageCollection1
-        Me.RibbonGalleryBarItem1.Gallery.ShowGroupCaption = True
-        Me.RibbonGalleryBarItem1.Gallery.ShowItemText = True
-        Me.RibbonGalleryBarItem1.Id = 1
-        Me.RibbonGalleryBarItem1.Name = "RibbonGalleryBarItem1"
+        Me.GalleryPlaceholders.Gallery.Images = Me.SvgImageCollection1
+        Me.GalleryPlaceholders.Gallery.ShowGroupCaption = True
+        Me.GalleryPlaceholders.Gallery.ShowItemText = True
+        Me.GalleryPlaceholders.Id = 1
+        Me.GalleryPlaceholders.Name = "GalleryPlaceholders"
        '
        'SvgImageCollection1
        '
@@ -104,17 +106,17 @@ Partial Class frmSQLEditor
        Me.btnExecuteSQL.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.updatedataextract3
        Me.btnExecuteSQL.Name = "btnExecuteSQL"
        '
-        'RibbonGalleryBarItem2
+        'GalleryConnection
        '
-        Me.RibbonGalleryBarItem2.Caption = "RibbonGalleryBarItem2"
+        Me.GalleryConnection.Caption = "RibbonGalleryBarItem2"
        '
        '
        '
-        Me.RibbonGalleryBarItem2.Gallery.CheckDrawMode = DevExpress.XtraBars.Ribbon.Gallery.CheckDrawMode.ImageAndText
-        Me.RibbonGalleryBarItem2.Gallery.ItemCheckMode = DevExpress.XtraBars.Ribbon.Gallery.ItemCheckMode.SingleRadio
-        Me.RibbonGalleryBarItem2.Gallery.ShowItemText = True
-        Me.RibbonGalleryBarItem2.Id = 5
-        Me.RibbonGalleryBarItem2.Name = "RibbonGalleryBarItem2"
+        Me.GalleryConnection.Gallery.CheckDrawMode = DevExpress.XtraBars.Ribbon.Gallery.CheckDrawMode.ImageAndText
+        Me.GalleryConnection.Gallery.ItemCheckMode = DevExpress.XtraBars.Ribbon.Gallery.ItemCheckMode.SingleRadio
+        Me.GalleryConnection.Gallery.ShowItemText = True
+        Me.GalleryConnection.Id = 5
+        Me.GalleryConnection.Name = "GalleryConnection"
        '
        'chkClearPlaceholders
        '
@@ -130,6 +132,15 @@ Partial Class frmSQLEditor
        Me.btnClearPlaceholders.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.clearall
        Me.btnClearPlaceholders.Name = "btnClearPlaceholders"
        '
+        'chkShowPlaceholders
+        '
+        Me.chkShowPlaceholders.BindableChecked = True
+        Me.chkShowPlaceholders.Caption = "Platzhalter anzeigen"
+        Me.chkShowPlaceholders.Checked = True
+        Me.chkShowPlaceholders.Id = 12
+        Me.chkShowPlaceholders.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.togglefieldcodes
+        Me.chkShowPlaceholders.Name = "chkShowPlaceholders"
+        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup4, Me.RibbonPageGroup1})
@@ -147,13 +158,14 @@ Partial Class frmSQLEditor
        '
        Me.RibbonPageGroup4.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far
        Me.RibbonPageGroup4.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.actions_database2
-        Me.RibbonPageGroup4.ItemLinks.Add(Me.RibbonGalleryBarItem2)
+        Me.RibbonPageGroup4.ItemLinks.Add(Me.GalleryConnection)
        Me.RibbonPageGroup4.Name = "RibbonPageGroup4"
        Me.RibbonPageGroup4.Text = "Verbindungen"
        '
        'RibbonPageGroup1
        '
-        Me.RibbonPageGroup1.ItemLinks.Add(Me.RibbonGalleryBarItem1)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.GalleryPlaceholders)
+        Me.RibbonPageGroup1.ItemLinks.Add(Me.chkShowPlaceholders)
        Me.RibbonPageGroup1.ItemLinks.Add(Me.chkClearPlaceholders)
        Me.RibbonPageGroup1.ItemLinks.Add(Me.btnClearPlaceholders)
        Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
@@ -171,24 +183,25 @@ Partial Class frmSQLEditor
        Me.RibbonPage2.Name = "RibbonPage2"
        Me.RibbonPage2.Text = "RibbonPage2"
        '
-        'RichEditControl1
+        'txtSQLCommand
        '
-        Me.RichEditControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.RichEditControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RichEditControl1.MenuManager = Me.RibbonControl1
-        Me.RichEditControl1.Name = "RichEditControl1"
-        Me.RichEditControl1.Size = New System.Drawing.Size(737, 508)
-        Me.RichEditControl1.TabIndex = 2
+        Me.txtSQLCommand.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.txtSQLCommand.Location = New System.Drawing.Point(0, 0)
+        Me.txtSQLCommand.MenuManager = Me.RibbonControl1
+        Me.txtSQLCommand.Name = "txtSQLCommand"
+        Me.txtSQLCommand.Size = New System.Drawing.Size(802, 508)
+        Me.txtSQLCommand.TabIndex = 2
        '
        'SplitContainerControl1
        '
+        Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
        Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 158)
        Me.SplitContainerControl1.Name = "SplitContainerControl1"
        '
        'SplitContainerControl1.Panel1
        '
-        Me.SplitContainerControl1.Panel1.Controls.Add(Me.RichEditControl1)
+        Me.SplitContainerControl1.Panel1.Controls.Add(Me.txtSQLCommand)
        Me.SplitContainerControl1.Panel1.Text = "Panel1"
        '
        'SplitContainerControl1.Panel2
@@ -196,7 +209,7 @@ Partial Class frmSQLEditor
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.GridPlaceholders)
        Me.SplitContainerControl1.Panel2.Text = "Panel2"
        Me.SplitContainerControl1.Size = New System.Drawing.Size(1056, 508)
-        Me.SplitContainerControl1.SplitterPosition = 737
+        Me.SplitContainerControl1.SplitterPosition = 802
        Me.SplitContainerControl1.TabIndex = 4
        '
        'GridPlaceholders
@@ -206,7 +219,7 @@ Partial Class frmSQLEditor
        Me.GridPlaceholders.MainView = Me.ViewPlaceholders
        Me.GridPlaceholders.MenuManager = Me.RibbonControl1
        Me.GridPlaceholders.Name = "GridPlaceholders"
-        Me.GridPlaceholders.Size = New System.Drawing.Size(309, 508)
+        Me.GridPlaceholders.Size = New System.Drawing.Size(244, 508)
        Me.GridPlaceholders.TabIndex = 0
        Me.GridPlaceholders.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.ViewPlaceholders})
        '
@@ -242,10 +255,11 @@ Partial Class frmSQLEditor
        Me.Controls.Add(Me.SplitContainerControl1)
        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.RibbonControl1)
+        Me.IconOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.editdatasource2
        Me.Name = "frmSQLEditor"
        Me.Ribbon = Me.RibbonControl1
        Me.StatusBar = Me.RibbonStatusBar1
-        Me.Text = "SQL Connector"
+        Me.Text = "SQL Designer"
        CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -266,9 +280,9 @@ Partial Class frmSQLEditor
    Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
    Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage
-    Friend WithEvents RibbonGalleryBarItem1 As DevExpress.XtraBars.RibbonGalleryBarItem
+    Friend WithEvents GalleryPlaceholders As DevExpress.XtraBars.RibbonGalleryBarItem
    Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection
-    Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl
+    Friend WithEvents txtSQLCommand As DevExpress.XtraRichEdit.RichEditControl
    Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl
    Friend WithEvents GridPlaceholders As DevExpress.XtraGrid.GridControl
    Friend WithEvents ViewPlaceholders As DevExpress.XtraGrid.Views.Grid.GridView
@@ -278,8 +292,9 @@ Partial Class frmSQLEditor
    Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents colPattern As DevExpress.XtraGrid.Columns.GridColumn
    Friend WithEvents colValue As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents RibbonGalleryBarItem2 As DevExpress.XtraBars.RibbonGalleryBarItem
+    Friend WithEvents GalleryConnection As DevExpress.XtraBars.RibbonGalleryBarItem
    Friend WithEvents RibbonPageGroup4 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
    Friend WithEvents chkClearPlaceholders As DevExpress.XtraBars.BarCheckItem
    Friend WithEvents btnClearPlaceholders As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents chkShowPlaceholders As DevExpress.XtraBars.BarCheckItem
 End Class