MS

GUIs.Common/SQLEditor/Placeholders.vb

@@ -3,8 +3,8 @@ Imports DevExpress.XtraBars.Ribbon
 
 Namespace SQLEditor
     Public Class Placeholders
-        Public Const AUTO_INDEX_ZOOFLOW = "ATTR_M"
-        Public Const MAN_INDEX_ZOOFLOW = "ATTR_A"
+        Public Const AUTO_INDEX_ZOOFLOW = "ATTR_A"
+        Public Const MAN_INDEX_ZOOFLOW = "ATTR_M"
 
         Public Function GetInternalPlaceholders() As GalleryItemGroup
             Dim oModule = "INT"
@@ -58,7 +58,7 @@ Namespace SQLEditor
             Dim oPrefix As String = pPrefix
 
             If oPrefix Is Nothing Then
-                oPrefix = AUTO_INDEX_ZOOFLOW
+                oPrefix = MAN_INDEX_ZOOFLOW
             End If
 
             If pPlaceholders.Count > 0 Then

GUIs.Common/frmSQLEditor.Designer.vb

@@ -23,6 +23,7 @@ Partial Class frmSQLEditor
     <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Me.components = New System.ComponentModel.Container()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmSQLEditor))
         Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.GalleryPlaceholders = New DevExpress.XtraBars.RibbonGalleryBarItem()
         Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
@@ -49,6 +50,7 @@ Partial Class frmSQLEditor
         Me.ViewPlaceholders = New DevExpress.XtraGrid.Views.Grid.GridView()
         Me.colPattern = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colValue = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem()
         CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -64,9 +66,9 @@ Partial Class frmSQLEditor
         'RibbonControl1
         '
         Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        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.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5})
+        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.BarButtonItem1, Me.BarButtonItem2, Me.BarButtonItem3, Me.BarButtonItem4, Me.BarButtonItem5, Me.BarButtonItem6})
         Me.RibbonControl1.Location = New System.Drawing.Point(0, 0)
-        Me.RibbonControl1.MaxItemId = 19
+        Me.RibbonControl1.MaxItemId = 20
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
         Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -100,7 +102,7 @@ Partial Class frmSQLEditor
         '
         'btnSave
         '
-        Me.btnSave.Caption = "Speichern und Schließen"
+        Me.btnSave.Caption = "Übernehmen und Schließen"
         Me.btnSave.Id = 3
         Me.btnSave.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.save2
         Me.btnSave.Name = "btnSave"
@@ -189,6 +191,7 @@ Partial Class frmSQLEditor
         '
         'RibbonPageGroup3
         '
+        Me.RibbonPageGroup3.ItemLinks.Add(Me.BarButtonItem6)
         Me.RibbonPageGroup3.ItemLinks.Add(Me.btnSave)
         Me.RibbonPageGroup3.ItemLinks.Add(Me.btnExecuteSQL)
         Me.RibbonPageGroup3.ItemLinks.Add(Me.GalleryConnection)
@@ -280,6 +283,13 @@ Partial Class frmSQLEditor
         Me.colValue.Visible = True
         Me.colValue.VisibleIndex = 1
         '
+        'BarButtonItem6
+        '
+        Me.BarButtonItem6.Caption = "Abbrechen"
+        Me.BarButtonItem6.Id = 19
+        Me.BarButtonItem6.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.BarButtonItem6.Name = "BarButtonItem6"
+        '
         'frmSQLEditor
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -335,4 +345,5 @@ Partial Class frmSQLEditor
     Friend WithEvents BarButtonItem3 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem4 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents BarButtonItem5 As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents BarButtonItem6 As DevExpress.XtraBars.BarButtonItem
 End Class

GUIs.Common/frmSQLEditor.resx

@@ -120,4 +120,20 @@
   <metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="BarButtonItem6.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANcBAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQo8L3N0
+        eWxlPg0KICA8cGF0aCBkPSJNMTYsMkM4LjMsMiwyLDguMywyLDE2czYuMywxNCwxNCwxNHMxNC02LjMs
+        MTQtMTRTMjMuNywyLDE2LDJ6IE0yMywyMGwtMywzbC00LTRsLTQsNGwtMy0zbDQtNGwtNC00bDMtM2w0
+        LDQgIGw0LTRsMywzbC00LDRMMjMsMjB6IiBjbGFzcz0iUmVkIiAvPg0KPC9zdmc+Cw==
+</value>
+  </data>
 </root>

GUIs.Common/frmSQLEditor.vb

@@ -294,4 +294,9 @@ Public Class frmSQLEditor
         DialogResult = FormResult
 
     End Sub
+
+    Private Sub BarButtonItem6_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem6.ItemClick
+        FormResult = DialogResult.Cancel
+        Me.Close()
+    End Sub
 End Class