From c33d5ff3403c7fb6d6349d850ff181bd28f351b6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Thu, 29 Apr 2021 16:08:31 +0200 Subject: [PATCH] SQLEditor: Minor Tweaks --- Controls.SQLEditor/frmSQLEditor.Designer.vb | 58 ++++++++++----------- Controls.SQLEditor/frmSQLEditor.resx | 2 +- Controls.SQLEditor/frmSQLEditor.vb | 18 +++---- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/Controls.SQLEditor/frmSQLEditor.Designer.vb b/Controls.SQLEditor/frmSQLEditor.Designer.vb index 053619f6..922dbfba 100644 --- a/Controls.SQLEditor/frmSQLEditor.Designer.vb +++ b/Controls.SQLEditor/frmSQLEditor.Designer.vb @@ -22,17 +22,17 @@ Partial Class frmSQLEditor Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim EditorButtonImageOptions3 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim EditorButtonImageOptions1 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQLEditor)) - Dim SerializableAppearanceObject9 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject10 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject11 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject12 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim EditorButtonImageOptions4 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() - Dim SerializableAppearanceObject13 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject14 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject15 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject16 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject1 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject2 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject3 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject4 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim EditorButtonImageOptions2 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() + Dim SerializableAppearanceObject5 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject6 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject7 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() + Dim SerializableAppearanceObject8 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Me.RepositoryItemRibbonSearchEdit2 = New DevExpress.XtraBars.Ribbon.Internal.RepositoryItemRibbonSearchEdit() Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl() Me.GridControlPlaceholders = New DevExpress.XtraGrid.GridControl() @@ -111,9 +111,9 @@ Partial Class frmSQLEditor Me.RepositoryItemRibbonSearchEdit2.AllowFocused = False Me.RepositoryItemRibbonSearchEdit2.AutoHeight = False Me.RepositoryItemRibbonSearchEdit2.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder - EditorButtonImageOptions3.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True] - EditorButtonImageOptions3.SvgImage = CType(resources.GetObject("EditorButtonImageOptions3.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.RepositoryItemRibbonSearchEdit2.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, True, True, True, EditorButtonImageOptions3, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject9, SerializableAppearanceObject10, SerializableAppearanceObject11, SerializableAppearanceObject12, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default]), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear, "", -1, True, False, False, EditorButtonImageOptions4, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject13, SerializableAppearanceObject14, SerializableAppearanceObject15, SerializableAppearanceObject16, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + EditorButtonImageOptions1.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.[True] + EditorButtonImageOptions1.SvgImage = CType(resources.GetObject("EditorButtonImageOptions1.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.RepositoryItemRibbonSearchEdit2.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, True, True, True, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default]), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Clear, "", -1, True, False, False, EditorButtonImageOptions2, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject5, SerializableAppearanceObject6, SerializableAppearanceObject7, SerializableAppearanceObject8, "", Nothing, Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) Me.RepositoryItemRibbonSearchEdit2.Name = "RepositoryItemRibbonSearchEdit2" Me.RepositoryItemRibbonSearchEdit2.NullText = "Search" ' @@ -128,10 +128,10 @@ Partial Class frmSQLEditor Me.LayoutControl1.Controls.Add(Me.DropDownButton3) Me.LayoutControl1.Controls.Add(Me.cmbConnections) Me.LayoutControl1.Dock = System.Windows.Forms.DockStyle.Fill - Me.LayoutControl1.Location = New System.Drawing.Point(0, 63) + Me.LayoutControl1.Location = New System.Drawing.Point(0, 66) Me.LayoutControl1.Name = "LayoutControl1" Me.LayoutControl1.Root = Me.Root - Me.LayoutControl1.Size = New System.Drawing.Size(1283, 605) + Me.LayoutControl1.Size = New System.Drawing.Size(1283, 604) Me.LayoutControl1.TabIndex = 0 Me.LayoutControl1.Text = "LayoutControl1" ' @@ -142,7 +142,7 @@ Partial Class frmSQLEditor Me.GridControlPlaceholders.MainView = Me.GridViewPlaceholder Me.GridControlPlaceholders.MenuManager = Me.RibbonControl1 Me.GridControlPlaceholders.Name = "GridControlPlaceholders" - Me.GridControlPlaceholders.Size = New System.Drawing.Size(417, 246) + Me.GridControlPlaceholders.Size = New System.Drawing.Size(417, 245) Me.GridControlPlaceholders.TabIndex = 7 Me.GridControlPlaceholders.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewPlaceholder}) ' @@ -178,7 +178,7 @@ Partial Class frmSQLEditor Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide Me.RibbonControl1.ShowToolbarCustomizeItem = False - Me.RibbonControl1.Size = New System.Drawing.Size(1283, 63) + Me.RibbonControl1.Size = New System.Drawing.Size(1283, 66) Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 Me.RibbonControl1.Toolbar.ShowCustomizeItem = False ' @@ -250,10 +250,10 @@ Partial Class frmSQLEditor Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem2) Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem3) - Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 668) + Me.RibbonStatusBar1.Location = New System.Drawing.Point(0, 670) Me.RibbonStatusBar1.Name = "RibbonStatusBar1" Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 - Me.RibbonStatusBar1.Size = New System.Drawing.Size(1283, 24) + Me.RibbonStatusBar1.Size = New System.Drawing.Size(1283, 22) ' 'GridControlResult ' @@ -261,7 +261,7 @@ Partial Class frmSQLEditor Me.GridControlResult.MainView = Me.GridViewResult Me.GridControlResult.MenuManager = Me.RibbonControl1 Me.GridControlResult.Name = "GridControlResult" - Me.GridControlResult.Size = New System.Drawing.Size(838, 246) + Me.GridControlResult.Size = New System.Drawing.Size(838, 245) Me.GridControlResult.TabIndex = 5 Me.GridControlResult.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewResult}) ' @@ -345,10 +345,10 @@ Partial Class frmSQLEditor ' 'RibbonStatusBar11 ' - Me.RibbonStatusBar11.Location = New System.Drawing.Point(0, 752) + Me.RibbonStatusBar11.Location = New System.Drawing.Point(0, 757) Me.RibbonStatusBar11.Name = "RibbonStatusBar11" Me.RibbonStatusBar11.Ribbon = Me.RibbonControl11 - Me.RibbonStatusBar11.Size = New System.Drawing.Size(1283, 27) + Me.RibbonStatusBar11.Size = New System.Drawing.Size(1283, 22) ' 'DropDownButton2 ' @@ -386,7 +386,7 @@ Partial Class frmSQLEditor Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3, Me.LayoutControlItem2, Me.LayoutControlItem4, Me.SimpleLabelItem2, Me.LayoutControlItem1, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem7, Me.LayoutControlItem8, Me.SimpleSeparator1, Me.SimpleLabelItem1, Me.SimpleSeparator2}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(1283, 605) + Me.Root.Size = New System.Drawing.Size(1283, 604) Me.Root.TextVisible = False ' 'LayoutControlItem3 @@ -400,14 +400,14 @@ Partial Class frmSQLEditor Me.LayoutControlItem3.Size = New System.Drawing.Size(421, 59) Me.LayoutControlItem3.Text = "SQL Verbindung" Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem3.TextSize = New System.Drawing.Size(97, 16) + Me.LayoutControlItem3.TextSize = New System.Drawing.Size(105, 16) ' 'LayoutControlItem2 ' Me.LayoutControlItem2.Control = Me.GridControlResult Me.LayoutControlItem2.Location = New System.Drawing.Point(421, 335) Me.LayoutControlItem2.Name = "LayoutControlItem2" - Me.LayoutControlItem2.Size = New System.Drawing.Size(842, 250) + Me.LayoutControlItem2.Size = New System.Drawing.Size(842, 249) Me.LayoutControlItem2.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem2.TextVisible = False ' @@ -416,7 +416,7 @@ Partial Class frmSQLEditor Me.LayoutControlItem4.Control = Me.GridControlPlaceholders Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 335) Me.LayoutControlItem4.Name = "LayoutControlItem4" - Me.LayoutControlItem4.Size = New System.Drawing.Size(421, 250) + Me.LayoutControlItem4.Size = New System.Drawing.Size(421, 249) Me.LayoutControlItem4.TextSize = New System.Drawing.Size(0, 0) Me.LayoutControlItem4.TextVisible = False ' @@ -430,7 +430,7 @@ Partial Class frmSQLEditor Me.SimpleLabelItem2.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.SimpleLabelItem2.Size = New System.Drawing.Size(842, 36) Me.SimpleLabelItem2.Text = "Ergebnis" - Me.SimpleLabelItem2.TextSize = New System.Drawing.Size(97, 16) + Me.SimpleLabelItem2.TextSize = New System.Drawing.Size(105, 16) ' 'LayoutControlItem1 ' @@ -443,7 +443,7 @@ Partial Class frmSQLEditor Me.LayoutControlItem1.Size = New System.Drawing.Size(1263, 238) Me.LayoutControlItem1.Text = "SQL Abfrage" Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(97, 16) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(105, 16) ' 'LayoutControlItem5 ' @@ -501,7 +501,7 @@ Partial Class frmSQLEditor Me.SimpleLabelItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10) Me.SimpleLabelItem1.Size = New System.Drawing.Size(421, 36) Me.SimpleLabelItem1.Text = "Platzhalter" - Me.SimpleLabelItem1.TextSize = New System.Drawing.Size(97, 16) + Me.SimpleLabelItem1.TextSize = New System.Drawing.Size(105, 16) ' 'SimpleSeparator2 ' diff --git a/Controls.SQLEditor/frmSQLEditor.resx b/Controls.SQLEditor/frmSQLEditor.resx index a5a8d34e..f53ea551 100644 --- a/Controls.SQLEditor/frmSQLEditor.resx +++ b/Controls.SQLEditor/frmSQLEditor.resx @@ -118,7 +118,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl diff --git a/Controls.SQLEditor/frmSQLEditor.vb b/Controls.SQLEditor/frmSQLEditor.vb index c48c20c7..fb2b9c13 100644 --- a/Controls.SQLEditor/frmSQLEditor.vb +++ b/Controls.SQLEditor/frmSQLEditor.vb @@ -12,17 +12,17 @@ Public Class frmSQLEditor Private SQLServer As MSSQLServer Private CurrentPosition As String - Private Placeholders As New List(Of SqlPlaceholder) - Private Connections As New List(Of SqlConnection) + Private Placeholders As New List(Of Placeholder) + Private Connections As New List(Of Connection) Private Patterns As ClassPatterns - Friend Class SqlPlaceholder + Friend Class Placeholder Public Property Placeholder As String Public Property Replacement As String End Class - Friend Class SqlConnection + Friend Class Connection Public Property Guid As Integer Public Property Name As String Public Property Description As String @@ -74,10 +74,10 @@ Public Class frmSQLEditor Try Dim oSQL As String = "SELECT * FROM TBDD_CONNECTION" Dim oTable As DataTable = SQLServer.GetDatatable(oSQL) - Dim oConnections As New List(Of SqlConnection) + Dim oConnections As New List(Of Connection) For Each oRow As DataRow In oTable.Rows - oConnections.Add(New SqlConnection With { + oConnections.Add(New Connection With { .Guid = NotNull(oRow.Item("GUID"), String.Empty), .Name = NotNull(oRow.Item("BEZEICHNUNG"), String.Empty), .Provider = NotNull(oRow.Item("SQL_PROVIDER"), String.Empty), @@ -92,7 +92,7 @@ Public Class frmSQLEditor Return oConnections Catch ex As Exception ShowErrorMessage(ex) - Return New List(Of SqlConnection) + Return New List(Of Connection) End Try End Function @@ -110,7 +110,7 @@ Public Class frmSQLEditor Try Dim oSQL As String = txtSQL.EditValue.ToString - Dim oConnection As SqlConnection = cmbConnections.SelectedItem + Dim oConnection As Connection = cmbConnections.SelectedItem Dim oConnectionString = SQLServer.GetConnectionString(oConnection.Server, oConnection.Database, oConnection.Username, oConnection.Password) Dim oTable As DataTable = SQLServer.GetDatatableWithConnection(oSQL, oConnectionString) @@ -136,7 +136,7 @@ Public Class frmSQLEditor Placeholders.Clear() For Each oPattern In Patterns.GetAllPatterns(Text) - Placeholders.Add(New SqlPlaceholder With { + Placeholders.Add(New Placeholder With { .Placeholder = oPattern.ToString, .Replacement = "" })