Zooflow: Include new SQLEditor into Zooflow

This commit is contained in:
Jonathan Jenne
2022-05-09 15:27:29 +02:00
parent 24fb1f00bc
commit 77a7cb4d75
13 changed files with 575 additions and 376 deletions

View File

@@ -120,6 +120,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
Friend ReadOnly Property autoarrange() As DevExpress.Utils.Svg.SvgImage
Get
Dim obj As Object = ResourceManager.GetObject("autoarrange", resourceCulture)
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
@@ -190,6 +200,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
Friend ReadOnly Property handtool() As DevExpress.Utils.Svg.SvgImage
Get
Dim obj As Object = ResourceManager.GetObject("handtool", resourceCulture)
Return CType(obj,DevExpress.Utils.Svg.SvgImage)
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>

View File

@@ -142,32 +142,38 @@
<data name="cleartablestyle" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cleartablestyle.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="handtool" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\handtool.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="electronics_desktopmac" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\electronics_desktopmac.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="editdatasource2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editdatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="clearall" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="editdatasource1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="actions_database2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_database2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="updatedataextract3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\updatedataextract3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="updatedataextract1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\updatedataextract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="updatedataextract3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\updatedataextract3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="clearall" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="actions_checkcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="editdatasource1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="togglefieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="updatedataextract" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -175,7 +181,7 @@
<data name="actions_database1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_database1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="togglefieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="autoarrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\autoarrange.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
</root>

View File

@@ -18,6 +18,53 @@ Public Class Placeholders
Return oGroup1
End Function
Public Function GetManualPlaceholders() As GalleryItemGroup
Return GetManualPlaceholders(New List(Of String))
End Function
Public Function GetManualPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup
Dim oImage = My.Resources.handtool
Dim oItems As New List(Of GalleryItem)()
If pPlaceholders.Count > 0 Then
For Each oManualPlaceholder In pPlaceholders
oItems.Add(GetGalleryItem(New Placeholder(oManualPlaceholder, "Manuelles Attribut", "ATTR_M", oManualPlaceholder), oImage))
Next
Else
oItems.Add(GetGalleryItem(New Placeholder("Attribut", "Manuelles Attribut", "ATTR_M", "ATTRIBUTE"), oImage))
End If
Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Manuelle Attribute"}
oGroup1.Items.AddRange(oItems.ToArray)
Return oGroup1
End Function
Public Function GetAutomaticPlaceholders() As GalleryItemGroup
Return GetAutomaticPlaceholders(New List(Of String))
End Function
Public Function GetAutomaticPlaceholders(pPlaceholders As List(Of String)) As GalleryItemGroup
Dim oImage = My.Resources.autoarrange
Dim oItems As New List(Of GalleryItem)()
If pPlaceholders.Count > 0 Then
For Each oManualPlaceholder In pPlaceholders
oItems.Add(GetGalleryItem(New Placeholder(oManualPlaceholder, "Automatisches Attribut", "ATTR_A", oManualPlaceholder), oImage))
Next
Else
oItems.Add(GetGalleryItem(New Placeholder("Attribut", "Automatisches Attribut", "ATTR_A", "ATTRIBUTE"), oImage))
End If
Dim oGroup1 = New GalleryItemGroup() With {.Caption = "Automatisches Attribut"}
oGroup1.Items.AddRange(oItems.ToArray)
Return oGroup1
End Function
Public Function GetUserGroup() As GalleryItemGroup
Dim oModule = "USER"
Dim oImage = My.Resources.actions_user

View File

@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Green{fill:#039C23;}
.Black{fill:#727272;}
.Red{fill:#D11C1C;}
.Yellow{fill:#FFB115;}
.Blue{fill:#1177D7;}
.White{fill:#FFFFFF;}
.st0{opacity:0.5;}
.st1{opacity:0.75;}
</style>
<g id="AutoArrange">
<path d="M29,2H5C4.5,2,4,2.5,4,3v26c0,0.5,0.5,1,1,1h24c0.5,0,1-0.5,1-1V3C30,2.5,29.5,2,29,2z M28,28H6V4h22V28z" class="Black" />
<path d="M24,24h-2.7l-1.2-4H14l-1.2,4H10l5.6-16h2.8L24,24z M19.3,18L17,11c-0.1,0.4-2.3,7-2.3,7H19.3z" class="Blue" />
</g>
</svg>

View File

@@ -0,0 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Yellow{fill:#FFB115;}
.Red{fill:#D11C1C;}
.Blue{fill:#1177D7;}
.Green{fill:#039C23;}
.Black{fill:#727272;}
.White{fill:#FFFFFF;}
.st0{opacity:0.75;}
</style>
<g id="HandTool">
<path d="M31.1,8.3c-1.1-0.7-2.5-0.2-2.9,0.9l-1.9,4.1c-0.2,0.4-0.6,0.6-1,0.6h0c-0.7,0-1.2-0.6-1-1.3L26,4.4 c0.2-1.1-0.4-2.1-1.5-2.4c-1.1-0.2-2.1,0.4-2.4,1.5l-1.9,7.6c-0.1,0.5-0.5,0.8-1,0.8h-0.1c-0.6,0-1.1-0.5-1.1-1.1V2.1 c0-1-0.7-1.9-1.6-2.1C15.1-0.2,14,0.8,14,2v8.9c0,0.6-0.5,1.1-1.1,1.1h-0.1c-0.5,0-0.9-0.3-1-0.8L10,3.6C9.7,2.4,8.4,1.7,7.3,2.2 C6.3,2.5,5.9,3.6,6.1,4.6l2.5,11.3c0.2,0.8-0.7,1.5-1.5,1.1l-4-2.6c-0.8-0.5-1.8-0.4-2.5,0.3c-0.8,0.8-0.8,2.1,0,2.9L10.9,28 c1.2,1.3,3,2,4.9,2H20c2.9,0,4.7-2,5.9-4.8l5.9-14.3C32.2,10,31.9,8.9,31.1,8.3z" class="Black" />
</g>
</svg>

View File

@@ -255,5 +255,11 @@
<ItemGroup>
<None Include="Resources\togglefieldcodes.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\handtool.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\autoarrange.svg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project>

View File

@@ -33,6 +33,8 @@ Partial Class frmSQLEditor
Me.chkClearPlaceholders = New DevExpress.XtraBars.BarCheckItem()
Me.btnClearPlaceholders = New DevExpress.XtraBars.BarButtonItem()
Me.chkShowPlaceholders = New DevExpress.XtraBars.BarCheckItem()
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
Me.BarButtonItem2 = New DevExpress.XtraBars.BarButtonItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup3 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroup4 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -60,9 +62,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.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.RibbonControl1.Location = New System.Drawing.Point(0, 0)
Me.RibbonControl1.MaxItemId = 13
Me.RibbonControl1.MaxItemId = 15
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -94,14 +96,14 @@ Partial Class frmSQLEditor
'
'btnSave
'
Me.btnSave.Caption = "Speichern"
Me.btnSave.Caption = "Speichern und Schließen"
Me.btnSave.Id = 3
Me.btnSave.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.check
Me.btnSave.Name = "btnSave"
'
'btnExecuteSQL
'
Me.btnExecuteSQL.Caption = "SQL Ausführen"
Me.btnExecuteSQL.Caption = "SQL Ausführen (F5)"
Me.btnExecuteSQL.Id = 4
Me.btnExecuteSQL.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.updatedataextract3
Me.btnExecuteSQL.Name = "btnExecuteSQL"
@@ -114,6 +116,7 @@ Partial Class frmSQLEditor
'
Me.GalleryConnection.Gallery.CheckDrawMode = DevExpress.XtraBars.Ribbon.Gallery.CheckDrawMode.ImageAndText
Me.GalleryConnection.Gallery.ItemCheckMode = DevExpress.XtraBars.Ribbon.Gallery.ItemCheckMode.SingleRadio
Me.GalleryConnection.Gallery.RowCount = 1
Me.GalleryConnection.Gallery.ShowItemText = True
Me.GalleryConnection.Id = 5
Me.GalleryConnection.Name = "GalleryConnection"
@@ -141,6 +144,20 @@ Partial Class frmSQLEditor
Me.chkShowPlaceholders.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.togglefieldcodes
Me.chkShowPlaceholders.Name = "chkShowPlaceholders"
'
'BarButtonItem1
'
Me.BarButtonItem1.Caption = "BarButtonItem1"
Me.BarButtonItem1.Id = 13
Me.BarButtonItem1.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.handtool
Me.BarButtonItem1.Name = "BarButtonItem1"
'
'BarButtonItem2
'
Me.BarButtonItem2.Caption = "BarButtonItem2"
Me.BarButtonItem2.Id = 14
Me.BarButtonItem2.ImageOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.autoarrange
Me.BarButtonItem2.Name = "BarButtonItem2"
'
'RibbonPage1
'
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup3, Me.RibbonPageGroup4, Me.RibbonPageGroup1})
@@ -256,6 +273,7 @@ Partial Class frmSQLEditor
Me.Controls.Add(Me.RibbonStatusBar1)
Me.Controls.Add(Me.RibbonControl1)
Me.IconOptions.SvgImage = Global.DigitalData.Controls.SQLEditor.My.Resources.Resources.editdatasource2
Me.KeyPreview = True
Me.Name = "frmSQLEditor"
Me.Ribbon = Me.RibbonControl1
Me.StatusBar = Me.RibbonStatusBar1
@@ -297,4 +315,6 @@ Partial Class frmSQLEditor
Friend WithEvents chkClearPlaceholders As DevExpress.XtraBars.BarCheckItem
Friend WithEvents btnClearPlaceholders As DevExpress.XtraBars.BarButtonItem
Friend WithEvents chkShowPlaceholders As DevExpress.XtraBars.BarCheckItem
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
End Class

View File

@@ -120,7 +120,4 @@
<metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<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>

View File

@@ -18,14 +18,8 @@ Public Class frmSQLEditor
Public Property SQLCommand As String = ""
Public Property SQLConnection As Integer = 0
Public Enum PlaceholderCollection
Globix
Zooflow
End Enum
Public Sub SetPlaceholders(pCollection As PlaceholderCollection)
End Sub
Public Property PlaceholdersManual As List(Of String)
Public Property PlaceholdersAutomatic As List(Of String)
Public Sub New(pLogConfig As LogConfig, pDatabase As MSSQLServer)
' Dieser Aufruf ist für den Designer erforderlich.
@@ -41,6 +35,14 @@ Public Class frmSQLEditor
Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
FormLoading = True
Try
If PlaceholdersAutomatic Is Nothing Then
PlaceholdersAutomatic = New List(Of String)
End If
If PlaceholdersManual Is Nothing Then
PlaceholdersManual = New List(Of String)
End If
If SQLCommand <> String.Empty Then
txtSQLCommand.Document.Text = SQLCommand
End If
@@ -63,8 +65,6 @@ Public Class frmSQLEditor
Dim oPlaceholderGroups = LoadPlaceholders()
GalleryPlaceholders.Gallery.Groups.AddRange(oPlaceholderGroups.ToArray)
ConfigureRichEditControl()
chkClearPlaceholders.Checked = ClearPlaceholdersAfterSuccessfulExecute
@@ -86,15 +86,12 @@ Public Class frmSQLEditor
SQLConnection = oConnection.Id
End Sub
Private Function LoadPlaceholders() As List(Of GalleryItemGroup)
Dim oInternalPlaceholders = Placeholders.GetInternalGroup()
Dim oUserPlaceholder = Placeholders.GetUserGroup()
Return New List(Of GalleryItemGroup)() From {
oInternalPlaceholders,
oUserPlaceholder
Placeholders.GetInternalGroup(),
Placeholders.GetUserGroup(),
Placeholders.GetAutomaticPlaceholders(PlaceholdersAutomatic),
Placeholders.GetManualPlaceholders(PlaceholdersManual)
}
End Function
@@ -169,6 +166,15 @@ Public Class frmSQLEditor
End Sub
Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnExecuteSQL.ItemClick
ExecuteSQL()
End Sub
Private Class Connection
Public Property Id As Integer
Public Property Name As String
End Class
Private Sub ExecuteSQL()
Try
Dim oSql = txtSQLCommand.Document.Text
@@ -208,11 +214,6 @@ Public Class frmSQLEditor
End Try
End Sub
Private Class Connection
Public Property Id As Integer
Public Property Name As String
End Class
Private Sub BarCheckItem1_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkClearPlaceholders.CheckedChanged
If FormLoading = False Then
ClearPlaceholdersAfterSuccessfulExecute = chkClearPlaceholders.Checked
@@ -226,4 +227,15 @@ Public Class frmSQLEditor
Private Sub chkShowPlaceholders_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles chkShowPlaceholders.CheckedChanged
SplitContainerControl1.Collapsed = Not chkShowPlaceholders.Checked
End Sub
Private Sub btnSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnSave.ItemClick
SQLCommand = txtSQLCommand.Text
Close()
End Sub
Private Sub frmSQLEditor_KeyDown(sender As Object, e As KeyEventArgs) Handles MyBase.KeyDown
If e.KeyCode = Keys.F5 Then
ExecuteSQL()
End If
End Sub
End Class